[gentoo-commits] gentoo-x86 commit in games-action/xshipwars/files: xshipwars-2.6.1-build.patch xshipwars-2.6.1-64bit.patch

[Michael Sterrett (mr_bones_)]

mr_bones_    09/12/31 23:02:27

  Added:                xshipwars-2.6.1-build.patch
                        xshipwars-2.6.1-64bit.patch
  Log:
  version bump (bug #292052)
  (Portage version: 2.1.6.13/cvs/Linux i686)

Revision  Changes    Path
1.1                  games-action/xshipwars/files/xshipwars-2.6.1-build.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-action/xshipwars/files/xshipwars-2.6.1-build.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-action/xshipwars/files/xshipwars-2.6.1-build.patch?rev=1.1&content-type=text/plain

Index: xshipwars-2.6.1-build.patch
===================================================================
--- client/Makefile.install.UNIX
+++ client/Makefile.install.UNIX
@@ -11,9 +11,9 @@
 #
 
 INSTALL      = install
-INSTBINFLAGS = -m 0755 -s
+INSTBINFLAGS = -m 0755
 INSTUIDFLAGS = -m 4755
-INSTLIBFLAGS = -m 0755 -s
+INSTLIBFLAGS = -m 0755
 INSTINCFLAGS = -m 0644
 INSTMANFLAGS = -m 0644
 INSTCFGFLAGS = -m 0644
@@ -26,8 +26,10 @@
 MKDIRFLAGS = -p
 
 
-GAMES_DIR   = $(PREFIX)/games
-XSW_DIR     = $(PREFIX)/share/games/xshipwars
+BINDIR      = $(PREFIX)/games
+GAMES_DIR   = $(DESTDIR)$(BINDIR)
+DATADIR     = $(PREFIX)/share/games
+XSW_DIR     = $(DESTDIR)$(DATADIR)/xshipwars
 XSW_ETC_DIR = $(XSW_DIR)/etc
 
 XSW_CFG_FILE   = xsw.ini
--- monitor/Makefile.install.UNIX
+++ monitor/Makefile.install.UNIX
@@ -27,8 +27,10 @@
 MKDIR      = mkdir
 MKDIRFLAGS = -p
 
-GAMES_DIR          = $(PREFIX)/games
-XSW_DIR            = $(PREFIX)/share/games/xshipwars
+BINDIR             = $(PREFIX)/games
+GAMES_DIR          = $(DESTDIR)$(BINDIR)
+DATADIR            = $(PREFIX)/share/games
+XSW_DIR            = $(DESTDIR)$(DATADIR)/xshipwars
 MONITOR_IMAGES_DIR = $(XSW_DIR)/images/monitor
 
 HR = "-------------------------------------------------------------------------"
--- server/Makefile.install.UNIX
+++ server/Makefile.install.UNIX
@@ -29,7 +29,7 @@
 MKDIRFLAGS = -p
 
 
-SWSERV_BASE_DIR = $(PREFIX)/swserv
+SWSERV_BASE_DIR = $(DESTDIR)$(PREFIX)/swserv
 
 SWSERV_BIN_DIR  = $(SWSERV_BASE_DIR)/bin
 SWSERV_DB_DIR   = $(SWSERV_BASE_DIR)/db
--- unvedit/Makefile.install.UNIX
+++ unvedit/Makefile.install.UNIX
@@ -26,8 +26,10 @@
 MKDIR      = mkdir
 MKDIRFLAGS = -p
 
-GAMES_BIN_DIR      = $(PREFIX)/games
-XSW_DATA_DIR       = $(PREFIX)/share/games/xshipwars
+BINDIR             = $(PREFIX)/games
+GAMES_BIN_DIR      = $(DESTDIR)$(BINDIR)
+DATADIR            = $(PREFIX)/share/games
+XSW_DATA_DIR       = $(DESTDIR)$(DATADIR)/xshipwars
 UNVEDIT_IMAGES_DIR = $(XSW_DATA_DIR)/images/unvedit
 
 HR = "-------------------------------------------------------------------------"
--- client/xsw.h.old	2007-07-06 08:02:07.000000000 +0200
+++ client/xsw.h	2007-07-06 08:04:05.000000000 +0200
@@ -135,10 +135,10 @@
 #define XSW_DEF_SW_SERVER_DIR		CWD_STR
 #else
 #define XSW_DEF_LOCAL_DATA_DIR		".shipwars"
-#define XSW_DEF_GLOBAL_DATA_DIR		PREFIX "/share/games/xshipwars"
-#define XSW_DEF_GLOBAL_IMAGES_DIR	PREFIX "/share/games/xshipwars/images"
-#define XSW_DEF_GLOBAL_SOUNDS_DIR	PREFIX "/share/games/xshipwars/sounds"
-#define XSW_DEF_GLOBAL_ETC_DIR		PREFIX "/share/games/xshipwars/etc"
+#define XSW_DEF_GLOBAL_DATA_DIR		"@GENTOO_DATADIR@"
+#define XSW_DEF_GLOBAL_IMAGES_DIR	"@GENTOO_DATADIR@/images"
+#define XSW_DEF_GLOBAL_SOUNDS_DIR	"@GENTOO_DATADIR@/sounds"
+#define XSW_DEF_GLOBAL_ETC_DIR		"@GENTOO_DATADIR@/etc"
 #define XSW_DEF_SW_SERVER_DIR		"/home/swserv"
 #endif
 



1.1                  games-action/xshipwars/files/xshipwars-2.6.1-64bit.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-action/xshipwars/files/xshipwars-2.6.1-64bit.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-action/xshipwars/files/xshipwars-2.6.1-64bit.patch?rev=1.1&content-type=text/plain

Index: xshipwars-2.6.1-64bit.patch
===================================================================
diff -ru xsw-2.6.1.orig/client/keymapwin.cpp xsw-2.6.1/client/keymapwin.cpp
--- xsw-2.6.1.orig/client/keymapwin.cpp	2008-06-23 19:00:00.000000000 -0400
+++ xsw-2.6.1/client/keymapwin.cpp	2009-12-30 21:30:58.651780783 -0500
@@ -683,7 +683,7 @@
  */
 static void KeymapWinDrawCB(void *widget, void *data)
 {
-	const int amount = (int)data;
+	const int amount = (int)(size_t)data;
 	xsw_keymap_win_struct *kmw = XSW_KEYMAP_WIN(widget);
 	if(kmw == NULL)
 	    return;
diff -ru xsw-2.6.1.orig/client/sound.cpp xsw-2.6.1/client/sound.cpp
--- xsw-2.6.1.orig/client/sound.cpp	2008-06-23 19:00:00.000000000 -0400
+++ xsw-2.6.1/client/sound.cpp	2009-12-30 21:34:44.306792788 -0500
@@ -90,7 +90,7 @@
 #ifdef ESD_H
 	    /* Connect to the sound server */
 	    snd->con_data = (void *)esd_open_sound(NULL);
-	    if((int)snd->con_data < 0)
+	    if((int)(size_t)snd->con_data < 0)
 	    {
 		snd->con_data = NULL;
 		return(-1);
@@ -287,14 +287,14 @@
 		"xsw:%s",
 		path
 	    );
-	    id = esd_sample_getid((int)snd->con_data, esd_sndobj_path);
+	    id = esd_sample_getid((int)(size_t)snd->con_data, esd_sndobj_path);
 	    free(esd_sndobj_path);
 
 	    if(id < 0)
 	    {
 		fprintf(stderr,"(CACHING NOW)\n");
 		id = esd_file_cache(
-		    (int)snd->con_data,
+		    (int)(size_t)snd->con_data,
 		    "xsw",
 		    path
 		);
@@ -309,11 +309,11 @@
 	    if(id > -1)
 	    {
 		/* Stop the existing play (if any) */
-		esd_sample_stop((int)snd->con_data, id);
+		esd_sample_stop((int)(size_t)snd->con_data, id);
 
 		/* Set the volume */
 		if(esd_set_default_sample_pan(
-		    (int)snd->con_data,
+		    (int)(size_t)snd->con_data,
 		    id,
 		    (int)(vol_left * ESD_VOLUME_BASE),
 		    (int)(vol_right * ESD_VOLUME_BASE)
@@ -322,7 +322,7 @@
 		    fprintf(stderr, "esd_set_default_sample_pan() failed\n");
 
 		/* Start playing */
-		if(esd_sample_play((int)snd->con_data, id) < 0)
+		if(esd_sample_play((int)(size_t)snd->con_data, id) < 0)
 		{
 		    fprintf(stderr, "esd_sample_play() failed\n");
 		}
@@ -378,7 +378,7 @@
 
 	  case SOUND_SERVER_TYPE_ESOUND:
 #ifdef ESD_H
-	    esd_sample_stop((int)snd->con_data, (int)playid);
+	    esd_sample_stop((int)(size_t)snd->con_data, (int)playid);
 #endif	/* ESD_H */
 	    break;
 
@@ -467,7 +467,7 @@
 
 	  case SOUND_SERVER_TYPE_ESOUND:
 #ifdef ESD_H
-	    id = esd_file_cache((int)snd->con_data, "xsw", path);
+	    id = esd_file_cache((int)(size_t)snd->con_data, "xsw", path);
 	    if(id < 0)
 	    {
 		fprintf(stderr, "esd_file_cache() failed\n");
@@ -481,8 +481,8 @@
 		// (int)snd->bg_music_playid = id;  // Dan S: forbidden in ansi c++. Cast rvalue not lvalue.
 		snd->bg_music_playid = (void *)(&id);
 		if(esd_sample_loop(
-		    (int)snd->con_data,
-		    (int)snd->bg_music_playid)
+		    (int)(size_t)snd->con_data,
+		    (int)(size_t)snd->bg_music_playid)
 		   < 0
 		)
 		{
@@ -540,14 +540,14 @@
 	    if(snd->bg_music_playid != NULL)
 	    {
 		if(esd_sample_stop(
-		    (int)snd->con_data,
-		    (int)snd->bg_music_playid)
+		    (int)(size_t)snd->con_data,
+		    (int)(size_t)snd->bg_music_playid)
 		    < 0
 		)
 		    fprintf(stderr, "esd_sample_stop() failed\n");
 		if(esd_sample_free(
-		    (int)snd->con_data,
-		    (int)snd->bg_music_playid)
+		    (int)(size_t)snd->con_data,
+		    (int)(size_t)snd->bg_music_playid)
 		    < 0
 		)
 		    fprintf(stderr, "esd_sample_stop() failed\n");
@@ -688,7 +688,7 @@
 	    if(snd->con_data != NULL)
 	    {
 		SoundStopBackgroundMusic(snd);
-		esd_close((int)snd->con_data);
+		esd_close((int)(size_t)snd->con_data);
 		snd->con_data = NULL;
 	    }
 #endif  /* ESD_H */
diff -ru xsw-2.6.1.orig/client/vsmenuwin.cpp xsw-2.6.1/client/vsmenuwin.cpp
--- xsw-2.6.1.orig/client/vsmenuwin.cpp	2008-06-23 19:00:00.000000000 -0400
+++ xsw-2.6.1/client/vsmenuwin.cpp	2009-12-30 21:35:47.549785477 -0500
@@ -377,13 +377,13 @@
 	vsmw->freeze_count++;
 
 	pulist = &vsmw->type_pulist;
-	item->type = (int)PUListItemGetData(
+	item->type = (int)(size_t)PUListItemGetData(
 	    pulist,
 	    PUListGetSelItem(pulist)
 	);
 
 	pulist = &vsmw->action_pulist;
-	item->action = (int)PUListItemGetData(
+	item->action = (int)(size_t)PUListItemGetData(
 	    pulist,
 	    PUListGetSelItem(pulist)
 	);
@@ -564,7 +564,7 @@
  */
 static void VSMWDrawCB(void *widget, void *data)
 {
-	const int amount = (int)data;
+	const int amount = (int)(size_t)data;
 	xsw_vsmenu_win_struct *vsmw = XSW_VSMENU_WIN(widget);
 	if(vsmw == NULL)
 	    return;
@@ -592,7 +592,7 @@
 	if(vsmw->freeze_count > 0)
 	    return;
 
-	action = (int)PUListItemGetData(pulist, item_num);
+	action = (int)(size_t)PUListItemGetData(pulist, item_num);
 	for(i = 0; i < n; i++)
 	{
 	    v = &(vlist[i]);
diff -ru xsw-2.6.1.orig/client/wcheckbutton.cpp xsw-2.6.1/client/wcheckbutton.cpp
--- xsw-2.6.1.orig/client/wcheckbutton.cpp	2008-06-23 19:00:00.000000000 -0400
+++ xsw-2.6.1/client/wcheckbutton.cpp	2009-12-30 21:36:00.024941571 -0500
@@ -63,7 +63,7 @@
  */
 static void CBtnDrawCB(void *widget, void *data)
 {
-	int amount = (int)data;
+	int amount = (int)(size_t)data;
 	check_button_struct *cb = (check_button_struct *)widget;
 	if(cb == NULL)
 	    return;
diff -ru xsw-2.6.1.orig/client/wclist.cpp xsw-2.6.1/client/wclist.cpp
--- xsw-2.6.1.orig/client/wclist.cpp	2008-06-23 19:00:00.000000000 -0400
+++ xsw-2.6.1/client/wclist.cpp	2009-12-30 21:36:19.867780925 -0500
@@ -180,7 +180,7 @@
  */
 static void CListDrawCB(void *widget, void *data)
 {
-	int draw_amount = (int)data;
+	int draw_amount = (int)(size_t)data;
 	clist_struct *clist = (clist_struct *)widget;
 	if(clist == NULL)
 	    return;
diff -ru xsw-2.6.1.orig/client/wfilebrowser.cpp xsw-2.6.1/client/wfilebrowser.cpp
--- xsw-2.6.1.orig/client/wfilebrowser.cpp	2008-06-23 19:00:00.000000000 -0400
+++ xsw-2.6.1/client/wfilebrowser.cpp	2009-12-30 21:48:53.840781232 -0500
@@ -590,7 +590,7 @@
  */
 static void FBrowserDrawCB(void *widget, void *data)
 {
-	int draw_amount = (int)data;
+	int draw_amount = (int)(size_t)data;
 	fb_struct *fb = (fb_struct *)widget;
 	if(fb == NULL)
 	    return;
diff -ru xsw-2.6.1.orig/client/wpopuplist.cpp xsw-2.6.1/client/wpopuplist.cpp
--- xsw-2.6.1.orig/client/wpopuplist.cpp	2008-06-23 19:00:00.000000000 -0400
+++ xsw-2.6.1/client/wpopuplist.cpp	2009-12-30 21:52:55.864780577 -0500
@@ -311,7 +311,7 @@
  */
 static void PUListDrawCB(void *widget, void *data)
 {
-	int amount = (int)data;
+	int amount = (int)(size_t)data;
 	popup_list_struct *list = (popup_list_struct *)widget;
 	if(list == NULL)
 	    return;
diff -ru xsw-2.6.1.orig/client/wprompt.cpp xsw-2.6.1/client/wprompt.cpp
--- xsw-2.6.1.orig/client/wprompt.cpp	2008-06-23 19:00:00.000000000 -0400
+++ xsw-2.6.1/client/wprompt.cpp	2009-12-30 21:53:13.222906280 -0500
@@ -157,7 +157,7 @@
  */
 static void PromptDrawCB(void *widget, void *data)
 {
-	int amount = (int)data;
+	int amount = (int)(size_t)data;
 	prompt_struct *prompt = (prompt_struct *)widget;
 	if(prompt == NULL)
 	    return;
diff -ru xsw-2.6.1.orig/client/wscrollbar.cpp xsw-2.6.1/client/wscrollbar.cpp
--- xsw-2.6.1.orig/client/wscrollbar.cpp	2008-06-23 19:00:00.000000000 -0400
+++ xsw-2.6.1/client/wscrollbar.cpp	2009-12-30 21:53:42.093781356 -0500
@@ -130,7 +130,7 @@
 static void SBarScrollTimeoutCB(void *widget, void *data)
 {
 	int prev_x_pos, prev_y_pos;
-	int op = (int)data;
+	int op = (int)(size_t)data;
 	scroll_bar_struct *sb = (scroll_bar_struct *)widget;
 	if(sb == NULL)
 	    return;
diff -ru xsw-2.6.1.orig/monitor/mon.cpp xsw-2.6.1/monitor/mon.cpp
--- xsw-2.6.1.orig/monitor/mon.cpp	2008-06-23 19:00:00.000000000 -0400
+++ xsw-2.6.1/monitor/mon.cpp	2009-12-30 22:26:15.505784790 -0500
@@ -286,7 +286,7 @@
 
 static void MonDrawCB(void *widget, void *data)
 {
-	int amount = (int)data;
+	int amount = (int)(size_t)data;
 	monitor_struct *m = MONITOR(widget);
 	if(m == NULL)
 	    return;
diff -ru xsw-2.6.1.orig/monitor/wcheckbutton.cpp xsw-2.6.1/monitor/wcheckbutton.cpp
--- xsw-2.6.1.orig/monitor/wcheckbutton.cpp	2008-06-23 19:00:00.000000000 -0400
+++ xsw-2.6.1/monitor/wcheckbutton.cpp	2009-12-30 21:36:00.024941571 -0500
@@ -63,7 +63,7 @@
  */
 static void CBtnDrawCB(void *widget, void *data)
 {
-	int amount = (int)data;
+	int amount = (int)(size_t)data;
 	check_button_struct *cb = (check_button_struct *)widget;
 	if(cb == NULL)
 	    return;
diff -ru xsw-2.6.1.orig/monitor/wclist.cpp xsw-2.6.1/monitor/wclist.cpp
--- xsw-2.6.1.orig/monitor/wclist.cpp	2008-06-23 19:00:00.000000000 -0400
+++ xsw-2.6.1/monitor/wclist.cpp	2009-12-30 21:36:19.867780925 -0500
@@ -180,7 +180,7 @@
  */
 static void CListDrawCB(void *widget, void *data)
 {
-	int draw_amount = (int)data;
+	int draw_amount = (int)(size_t)data;
 	clist_struct *clist = (clist_struct *)widget;
 	if(clist == NULL)
 	    return;
diff -ru xsw-2.6.1.orig/monitor/wfilebrowser.cpp xsw-2.6.1/monitor/wfilebrowser.cpp
--- xsw-2.6.1.orig/monitor/wfilebrowser.cpp	2008-06-23 19:00:00.000000000 -0400
+++ xsw-2.6.1/monitor/wfilebrowser.cpp	2009-12-30 21:48:53.840781232 -0500
@@ -590,7 +590,7 @@
  */
 static void FBrowserDrawCB(void *widget, void *data)
 {
-	int draw_amount = (int)data;
+	int draw_amount = (int)(size_t)data;
 	fb_struct *fb = (fb_struct *)widget;
 	if(fb == NULL)
 	    return;
diff -ru xsw-2.6.1.orig/monitor/wpopuplist.cpp xsw-2.6.1/monitor/wpopuplist.cpp
--- xsw-2.6.1.orig/monitor/wpopuplist.cpp	2008-06-23 19:00:00.000000000 -0400
+++ xsw-2.6.1/monitor/wpopuplist.cpp	2009-12-30 21:52:55.864780577 -0500
@@ -311,7 +311,7 @@
  */
 static void PUListDrawCB(void *widget, void *data)
 {
-	int amount = (int)data;
+	int amount = (int)(size_t)data;
 	popup_list_struct *list = (popup_list_struct *)widget;
 	if(list == NULL)
 	    return;
diff -ru xsw-2.6.1.orig/monitor/wprompt.cpp xsw-2.6.1/monitor/wprompt.cpp
--- xsw-2.6.1.orig/monitor/wprompt.cpp	2008-06-23 19:00:00.000000000 -0400
+++ xsw-2.6.1/monitor/wprompt.cpp	2009-12-30 21:53:13.222906280 -0500
@@ -157,7 +157,7 @@
  */
 static void PromptDrawCB(void *widget, void *data)
 {
-	int amount = (int)data;
+	int amount = (int)(size_t)data;
 	prompt_struct *prompt = (prompt_struct *)widget;
 	if(prompt == NULL)
 	    return;
diff -ru xsw-2.6.1.orig/monitor/wscrollbar.cpp xsw-2.6.1/monitor/wscrollbar.cpp
--- xsw-2.6.1.orig/monitor/wscrollbar.cpp	2008-06-23 19:00:00.000000000 -0400
+++ xsw-2.6.1/monitor/wscrollbar.cpp	2009-12-30 21:53:42.093781356 -0500
@@ -130,7 +130,7 @@
 static void SBarScrollTimeoutCB(void *widget, void *data)
 {
 	int prev_x_pos, prev_y_pos;
-	int op = (int)data;
+	int op = (int)(size_t)data;
 	scroll_bar_struct *sb = (scroll_bar_struct *)widget;
 	if(sb == NULL)
 	    return;
diff -ru xsw-2.6.1.orig/unvedit/ecow.cpp xsw-2.6.1/unvedit/ecow.cpp
--- xsw-2.6.1.orig/unvedit/ecow.cpp	2008-06-23 19:00:00.000000000 -0400
+++ xsw-2.6.1/unvedit/ecow.cpp	2009-12-30 22:26:04.514785056 -0500
@@ -428,7 +428,7 @@
 	    strncpy(prod->name, s, sizeof(prod->name));
 	    prod->name[sizeof(prod->name) - 1] = '\0';
 	}
-	prod->ocs_code = (int)PUListItemGetData(pulist, i);
+	prod->ocs_code = (int)(size_t)PUListItemGetData(pulist, i);
 	prod->sell_price = PromptGetF(&ecow->prod_sell_prompt);
 	prod->buy_price = PromptGetF(&ecow->prod_buy_prompt);
 	prod->amount = PromptGetF(&ecow->prod_amount_prompt);
@@ -448,7 +448,7 @@
  */
 static void EcoWDrawCB(void *widget, void *data)
 {
-	const int amount = (int)data;
+	const int amount = (int)(size_t)data;
 	ecow_struct *ecow = ECOW(widget);
 	if(ecow == NULL)
 	    return;
diff -ru xsw-2.6.1.orig/unvedit/optwin.cpp xsw-2.6.1/unvedit/optwin.cpp
--- xsw-2.6.1.orig/unvedit/optwin.cpp	2008-06-23 19:00:00.000000000 -0400
+++ xsw-2.6.1/unvedit/optwin.cpp	2009-12-30 22:23:40.975781529 -0500
@@ -261,7 +261,7 @@
  */
 static void OptWinDrawCB(void *widget, void *data)
 {
-	const int amount = (int)data;
+	const int amount = (int)(size_t)data;
 	optwin_struct *ow = OPTWIN(widget);
 	if(ow == NULL)
 	    return;
@@ -590,7 +590,7 @@
 	clist = &ow->keymaps_list;
 	n = MIN(clist->total_rows, UE_TOTAL_KEYMAPS);
 	for(i = 0; i < n; i++)
-	    keymap[i].keycode = (keycode_t)CListRowGetData(clist, i);
+	    keymap[i].keycode = (keycode_t)(size_t)CListRowGetData(clist, i);
 
 	/* Reset has changes mark */
 	ow->has_changes = False;
diff -ru xsw-2.6.1.orig/unvedit/printdlg.cpp xsw-2.6.1/unvedit/printdlg.cpp
--- xsw-2.6.1.orig/unvedit/printdlg.cpp	2008-06-23 19:00:00.000000000 -0400
+++ xsw-2.6.1/unvedit/printdlg.cpp	2009-12-30 22:22:54.616785444 -0500
@@ -833,7 +833,7 @@
  */
 static void PrintDlgDrawCB(void *widget, void *data)
 {
-	const int amount = (int)data;
+	const int amount = (int)(size_t)data;
 	print_dlg_struct *pw = PRINT_DLG(widget);
 	if(pw == NULL)
 	    return;
diff -ru xsw-2.6.1.orig/unvedit/propdlg.cpp xsw-2.6.1/unvedit/propdlg.cpp
--- xsw-2.6.1.orig/unvedit/propdlg.cpp	2008-06-23 19:00:00.000000000 -0400
+++ xsw-2.6.1/unvedit/propdlg.cpp	2009-12-30 22:22:33.892785842 -0500
@@ -335,7 +335,7 @@
 }
 	SET_STRING(obj->name, &d->name_prompt);
 	pulist = &d->type_pulist;
-	obj->type = (int)PUListItemGetData(
+	obj->type = (int)(size_t)PUListItemGetData(
 	    pulist,
 	    PUListGetSelItem(pulist)
 	);
@@ -480,7 +480,7 @@
 	obj->scanner_range = MAX(PromptGetF(&d->scanner_range_prompt), 0.0f);
 
 	pulist = &d->engine_pulist;
-	obj->engine_state = (int)PUListItemGetData(
+	obj->engine_state = (int)(size_t)PUListItemGetData(
 	    pulist,
 	    PUListGetSelItem(pulist)
 	);
@@ -502,12 +502,12 @@
 	);
 
 	pulist = &d->shields_pulist;
-	obj->shield_state = (int)PUListItemGetData(
+	obj->shield_state = (int)(size_t)PUListItemGetData(
 	    pulist,
 	    PUListGetSelItem(pulist)
 	);
 	pulist = &d->cloak_pulist;
-	obj->cloak_state = (int)PUListItemGetData(
+	obj->cloak_state = (int)(size_t)PUListItemGetData(
 	    pulist,
 	    PUListGetSelItem(pulist)
 	);
@@ -543,7 +543,7 @@
 
 
 	pulist = &d->imgrefs_pulist;
-	obj->imgref = (int)PUListItemGetData(
+	obj->imgref = (int)(size_t)PUListItemGetData(
 	    pulist,
 	    PUListGetSelItem(pulist)
 	);
@@ -651,7 +651,7 @@
  */
 static void PropDlgDrawCB(void *widget, void *data)
 {
-	const int amount = (int)data;
+	const int amount = (int)(size_t)data;
 	prop_dlg_struct *d = PROP_DLG(widget);
 	if(d == NULL)
 	    return;
@@ -693,7 +693,7 @@
 	if(d->freeze_count > 0)
 	    return;
 
-	imgref_num = (int)PUListItemGetData(
+	imgref_num = (int)(size_t)PUListItemGetData(
 	    pulist, sel_item
 	);
 
@@ -1637,7 +1637,7 @@
 	    pixmap = d->object_display_buf;
 
 	    /* Get the currently displayed imgref */
-	    imgref_num = (int)PUListItemGetData(
+	    imgref_num = (int)(size_t)PUListItemGetData(
 		pulist,
 		PUListGetSelItem(pulist)
 	    );
@@ -1858,7 +1858,7 @@
 	d->freeze_count++;
 
 	pulist = &d->type_pulist;
-	type = (int)PUListItemGetData(
+	type = (int)(size_t)PUListItemGetData(
 	    pulist,
 	    PUListGetSelItem(pulist)
 	);
diff -ru xsw-2.6.1.orig/unvedit/uew.cpp xsw-2.6.1/unvedit/uew.cpp
--- xsw-2.6.1.orig/unvedit/uew.cpp	2008-06-23 19:00:00.000000000 -0400
+++ xsw-2.6.1/unvedit/uew.cpp	2009-12-30 22:20:44.340788956 -0500
@@ -142,7 +142,7 @@
  */
 static void UEWDrawCB(void *widget, void *data)
 {
-	const int amount = (int)data;
+	const int amount = (int)(size_t)data;
 	uew_struct *uew = UEW(widget);
 	if(uew == NULL)
 	    return;
diff -ru xsw-2.6.1.orig/unvedit/uewcb.cpp xsw-2.6.1/unvedit/uewcb.cpp
--- xsw-2.6.1.orig/unvedit/uewcb.cpp	2008-06-23 19:00:00.000000000 -0400
+++ xsw-2.6.1/unvedit/uewcb.cpp	2009-12-30 22:20:28.738858297 -0500
@@ -548,7 +548,7 @@
 	    return;
 
 	/* Get the selected imgref */
-	imgref_num = (int)PUListItemGetData(pulist, sel_item);
+	imgref_num = (int)(size_t)PUListItemGetData(pulist, sel_item);
 
 	/* Set the object's current property values */
 	UEWPropsDoSetValues(uew, obj_num);
diff -ru xsw-2.6.1.orig/unvedit/uhw.cpp xsw-2.6.1/unvedit/uhw.cpp
--- xsw-2.6.1.orig/unvedit/uhw.cpp	2008-06-23 19:00:00.000000000 -0400
+++ xsw-2.6.1/unvedit/uhw.cpp	2009-12-30 22:20:13.045780838 -0500
@@ -546,7 +546,7 @@
  */
 static void UHWDrawCB(void *widget, void *data)
 {
-	const int amount = (int)data;
+	const int amount = (int)(size_t)data;
 	uhw_struct *uhw = UHW(widget);
 	if(uhw == NULL)
 	    return;
diff -ru xsw-2.6.1.orig/unvedit/wcheckbutton.cpp xsw-2.6.1/unvedit/wcheckbutton.cpp
--- xsw-2.6.1.orig/unvedit/wcheckbutton.cpp	2008-06-23 19:00:00.000000000 -0400
+++ xsw-2.6.1/unvedit/wcheckbutton.cpp	2009-12-30 21:36:00.024941571 -0500
@@ -63,7 +63,7 @@
  */
 static void CBtnDrawCB(void *widget, void *data)
 {
-	int amount = (int)data;
+	int amount = (int)(size_t)data;
 	check_button_struct *cb = (check_button_struct *)widget;
 	if(cb == NULL)
 	    return;
diff -ru xsw-2.6.1.orig/unvedit/wclist.cpp xsw-2.6.1/unvedit/wclist.cpp
--- xsw-2.6.1.orig/unvedit/wclist.cpp	2008-06-23 19:00:00.000000000 -0400
+++ xsw-2.6.1/unvedit/wclist.cpp	2009-12-30 21:36:19.867780925 -0500
@@ -180,7 +180,7 @@
  */
 static void CListDrawCB(void *widget, void *data)
 {
-	int draw_amount = (int)data;
+	int draw_amount = (int)(size_t)data;
 	clist_struct *clist = (clist_struct *)widget;
 	if(clist == NULL)
 	    return;
diff -ru xsw-2.6.1.orig/unvedit/wepw.cpp xsw-2.6.1/unvedit/wepw.cpp
--- xsw-2.6.1.orig/unvedit/wepw.cpp	2008-06-23 19:00:00.000000000 -0400
+++ xsw-2.6.1/unvedit/wepw.cpp	2009-12-30 22:19:54.179785141 -0500
@@ -486,7 +486,7 @@
 	{
 	    const char *name = pulist_item->text;
 
-	    wep->ocs_code = (int)PUListItemGetData(pulist, i);
+	    wep->ocs_code = (int)(size_t)PUListItemGetData(pulist, i);
 
 	    if(!STRISEMPTY(name))
 	    {
@@ -528,7 +528,7 @@
 	wep->create_power = PromptGetF(&wepw->create_power_prompt);
 	wep->delay = PromptGetL(&wepw->delay_prompt);
 	pulist = &wepw->fire_sndref_pulist;
-	wep->fire_sndref = (int)PUListItemGetData(
+	wep->fire_sndref = (int)(size_t)PUListItemGetData(
 	    pulist,
 	    PUListGetSelItem(pulist)
 	);
@@ -561,7 +561,7 @@
  */
 static void WepWDrawCB(void *widget, void *data)
 {
-	const int amount = (int)data;
+	const int amount = (int)(size_t)data;
 	wepw_struct *wepw = WEPW(widget);        
 	if(wepw == NULL)
 	    return;
@@ -927,7 +927,7 @@
 	/* Weapons list */
 	clist = &wepw->list;
 	width = (unsigned int)MAX(
-	    (int)wepw->width - WEPW_BUTTON_WIDTH -
+	    (int)(size_t)wepw->width - WEPW_BUTTON_WIDTH -
 	    (2 * WEPW_MARGIN) - 5,
 	    100
 	);
diff -ru xsw-2.6.1.orig/unvedit/wfilebrowser.cpp xsw-2.6.1/unvedit/wfilebrowser.cpp
--- xsw-2.6.1.orig/unvedit/wfilebrowser.cpp	2008-06-23 19:00:00.000000000 -0400
+++ xsw-2.6.1/unvedit/wfilebrowser.cpp	2009-12-30 21:48:53.840781232 -0500
@@ -590,7 +590,7 @@
  */
 static void FBrowserDrawCB(void *widget, void *data)
 {
-	int draw_amount = (int)data;
+	int draw_amount = (int)(size_t)data;
 	fb_struct *fb = (fb_struct *)widget;
 	if(fb == NULL)
 	    return;
diff -ru xsw-2.6.1.orig/unvedit/wpopuplist.cpp xsw-2.6.1/unvedit/wpopuplist.cpp
--- xsw-2.6.1.orig/unvedit/wpopuplist.cpp	2008-06-23 19:00:00.000000000 -0400
+++ xsw-2.6.1/unvedit/wpopuplist.cpp	2009-12-30 21:52:55.864780577 -0500
@@ -311,7 +311,7 @@
  */
 static void PUListDrawCB(void *widget, void *data)
 {
-	int amount = (int)data;
+	int amount = (int)(size_t)data;
 	popup_list_struct *list = (popup_list_struct *)widget;
 	if(list == NULL)
 	    return;
diff -ru xsw-2.6.1.orig/unvedit/wprompt.cpp xsw-2.6.1/unvedit/wprompt.cpp
--- xsw-2.6.1.orig/unvedit/wprompt.cpp	2008-06-23 19:00:00.000000000 -0400
+++ xsw-2.6.1/unvedit/wprompt.cpp	2009-12-30 21:53:13.222906280 -0500
@@ -157,7 +157,7 @@
  */
 static void PromptDrawCB(void *widget, void *data)
 {
-	int amount = (int)data;
+	int amount = (int)(size_t)data;
 	prompt_struct *prompt = (prompt_struct *)widget;
 	if(prompt == NULL)
 	    return;
diff -ru xsw-2.6.1.orig/unvedit/wscrollbar.cpp xsw-2.6.1/unvedit/wscrollbar.cpp
--- xsw-2.6.1.orig/unvedit/wscrollbar.cpp	2008-06-23 19:00:00.000000000 -0400
+++ xsw-2.6.1/unvedit/wscrollbar.cpp	2009-12-30 21:53:42.093781356 -0500
@@ -130,7 +130,7 @@
 static void SBarScrollTimeoutCB(void *widget, void *data)
 {
 	int prev_x_pos, prev_y_pos;
-	int op = (int)data;
+	int op = (int)(size_t)data;
 	scroll_bar_struct *sb = (scroll_bar_struct *)widget;
 	if(sb == NULL)
 	    return;
diff -ru xsw-2.6.1.orig/widgets/wcheckbutton.cpp xsw-2.6.1/widgets/wcheckbutton.cpp
--- xsw-2.6.1.orig/widgets/wcheckbutton.cpp	2008-06-23 19:00:00.000000000 -0400
+++ xsw-2.6.1/widgets/wcheckbutton.cpp	2009-12-30 21:36:00.024941571 -0500
@@ -63,7 +63,7 @@
  */
 static void CBtnDrawCB(void *widget, void *data)
 {
-	int amount = (int)data;
+	int amount = (int)(size_t)data;
 	check_button_struct *cb = (check_button_struct *)widget;
 	if(cb == NULL)
 	    return;
diff -ru xsw-2.6.1.orig/widgets/wclist.cpp xsw-2.6.1/widgets/wclist.cpp
--- xsw-2.6.1.orig/widgets/wclist.cpp	2008-06-23 19:00:00.000000000 -0400
+++ xsw-2.6.1/widgets/wclist.cpp	2009-12-30 21:36:19.867780925 -0500
@@ -180,7 +180,7 @@
  */
 static void CListDrawCB(void *widget, void *data)
 {
-	int draw_amount = (int)data;
+	int draw_amount = (int)(size_t)data;
 	clist_struct *clist = (clist_struct *)widget;
 	if(clist == NULL)
 	    return;
diff -ru xsw-2.6.1.orig/widgets/wfilebrowser.cpp xsw-2.6.1/widgets/wfilebrowser.cpp
--- xsw-2.6.1.orig/widgets/wfilebrowser.cpp	2008-06-23 19:00:00.000000000 -0400
+++ xsw-2.6.1/widgets/wfilebrowser.cpp	2009-12-30 21:48:53.840781232 -0500
@@ -590,7 +590,7 @@
  */
 static void FBrowserDrawCB(void *widget, void *data)
 {
-	int draw_amount = (int)data;
+	int draw_amount = (int)(size_t)data;
 	fb_struct *fb = (fb_struct *)widget;
 	if(fb == NULL)
 	    return;
diff -ru xsw-2.6.1.orig/widgets/wpopuplist.cpp xsw-2.6.1/widgets/wpopuplist.cpp
--- xsw-2.6.1.orig/widgets/wpopuplist.cpp	2008-06-23 19:00:00.000000000 -0400
+++ xsw-2.6.1/widgets/wpopuplist.cpp	2009-12-30 21:52:55.864780577 -0500
@@ -311,7 +311,7 @@
  */
 static void PUListDrawCB(void *widget, void *data)
 {
-	int amount = (int)data;
+	int amount = (int)(size_t)data;
 	popup_list_struct *list = (popup_list_struct *)widget;
 	if(list == NULL)
 	    return;
diff -ru xsw-2.6.1.orig/widgets/wprompt.cpp xsw-2.6.1/widgets/wprompt.cpp
--- xsw-2.6.1.orig/widgets/wprompt.cpp	2008-06-23 19:00:00.000000000 -0400
+++ xsw-2.6.1/widgets/wprompt.cpp	2009-12-30 21:53:13.222906280 -0500
@@ -157,7 +157,7 @@
  */
 static void PromptDrawCB(void *widget, void *data)
 {
-	int amount = (int)data;
+	int amount = (int)(size_t)data;
 	prompt_struct *prompt = (prompt_struct *)widget;
 	if(prompt == NULL)
 	    return;
diff -ru xsw-2.6.1.orig/widgets/wscrollbar.cpp xsw-2.6.1/widgets/wscrollbar.cpp
--- xsw-2.6.1.orig/widgets/wscrollbar.cpp	2008-06-23 19:00:00.000000000 -0400
+++ xsw-2.6.1/widgets/wscrollbar.cpp	2009-12-30 21:53:42.093781356 -0500
@@ -130,7 +130,7 @@
 static void SBarScrollTimeoutCB(void *widget, void *data)
 {
 	int prev_x_pos, prev_y_pos;
-	int op = (int)data;
+	int op = (int)(size_t)data;
 	scroll_bar_struct *sb = (scroll_bar_struct *)widget;
 	if(sb == NULL)
 	    return;