SWP source code question

Page 1 of 1

You cannot start a new topic
You cannot reply to this topic

SWP source code question "For programmers who know Build/SWP/JFSW well"

Martin Howe

#1 Posted 07 August 2016 - 07:51 AM

Hi All

I had previously asked about SWP in the SW HRP thread, but do not want to clutter that up with non-HRP questions.

Working my way through SWP source code as I wanted to have a go at building it myself and started with current version from Hendricks266's port as that's probably the most up to date. Fixed many warnings and a couple of bugs but still testing.

I am methodically fixing warnings to get it to compile cleanly with the latest MinGW GCC but I have run into a roadblock. The palette entry type has the usual RGB values, but also a mysterious member 'f' where the alpha might normally be. Its only use seems to be "if negative, put 255 in tile data". However, the palette entry data is all unsigned, so the comparison always fails. Should this really read if (col->f &0x80) instead of if (col->f <0)? Or is there something more subtle going on? I have been programming for over 30 years and have contributed code to ZDoom in the past, but know little about the BUILD engine.

Any help would be appreciated, thanks!

Hendricks266

Weaponized Autism

#2 Posted 07 August 2016 - 09:39 AM

Is that line in the engine or in the game? If the engine, compare with JFBuild or EDuke32. I can't think of what purpose that if statement can serve at all.

Martin Howe

#3 Posted 07 August 2016 - 10:39 AM

Hendricks266, on 07 August 2016 - 09:39 AM, said:

Is that line in the engine or in the game? If the engine, compare with JFBuild or EDuke32. I can't think of what purpose that if statement can serve at all.

Thanks. It's in the engine, in gamep.h written by Ben for SWP and it seems to be reserved for WMF pallete entry flags defined by Microsoft in Win32. However no value defined by them has the MSB set or in any way could be said to be negative.

I shall just have to try and see what happens if I write it as "&0x80" instead of "<0" and see what breaks or suddenly works properly. Yuck Posted Image

Thanks again

Hendricks266

Weaponized Autism

#4 Posted 07 August 2016 - 11:38 AM

It could be that it means "if (col->f >= 128), use the transparent color" == "if alpha >= 50%". I don't know when that circumstance would arise. Is this code connected to the supplemental ART tiles that are included in the exe (the status bars)?

Martin Howe

#5 Posted 07 August 2016 - 12:07 PM

Hendricks266, on 07 August 2016 - 11:38 AM, said:

Yes it's when loading the ALT HUD, plus alt UZI & alt riot ammo. It certainly seems to be that way only presumably the palette flag (f) was int or signed char at some point, hence testing for < 0 as that's another way of doing & 0x80 (i.e., >= 128u), but only works if palette flags is signed. However, if the code is left as it is, the compiled .EXE behaves like the last Ben Smit SWP. Making the comparison work as if signed <0 compare leaves most of the ALT HUD blank (very minimal, just the numbers) and crashes the display driver, presumably because the transparency is an issue somewhere.

So without knowing what Ben intended there I will leave well alone and just disable that comparison. The ALT HUD looks nice enough as it is though takes up some screen space. Maybe it was experimental code for what eventually became the GZDoom style ALT HUD (called "modern" in SWP).

I don't know how much time you have to spend on SWP at the moment, but you'd be welcome to this code when finished. While I enjoy cleaning up code and fixing minor bugs I don't know enough about the BUILD engine to do any more than that. But saving and loading games seems to work at the moment and I seem to recall people complaining that was buggy so maybe this is worth something.

EDIT: Even wierder - making the comparison (col->f > 127) does the same thing with the display but doesn't crash anything. The resulting very minimal ALT HUD gets rid of the borders, backgrounds and symbols, leaving just numbers such as shuriken left and so on, but it works and looks reasonable in-game but text-only. Whether this is what was intended is anybody's guess, though

This post has been edited by Martin Howe: 07 August 2016 - 12:20 PM

Hendricks266

Weaponized Autism

#6 Posted 07 August 2016 - 12:10 PM

I would certainly welcome your contributions despite my rapidly fading interest in maintaining SWP. When you're ready, try making a pull request on GitHub.

Martin Howe

#7 Posted 07 August 2016 - 12:33 PM

Hendricks266, on 07 August 2016 - 12:10 PM, said:

I would certainly welcome your contributions despite my rapidly fading interest in maintaining SWP. When you're ready, try making a pull request on GitHub.

Sure - it'd be nice to have this maintained as not having a modern SWP is a real bummer and I understand you likely won't have time to take your EDuke32 SWP port any further.

I'll do that Git thing when I've had a chance to finish this and fully test it. Of course as I'm more used to SVN maybe I'd better fire up Google and find out exactly what a pull request is and how to make one - I see it on ZDoom forums all the time LOL

Robman

Asswhipe [sic]

#8 Posted 07 August 2016 - 01:12 PM

Make a new port for SW, bug free.

Just a port, don't add extra fancy shit.

Port.

Bug free.

Maybe improved multiplayer.

This post has been edited by Robman: 07 August 2016 - 01:14 PM

Mark

#9 Posted 07 August 2016 - 03:46 PM

I don't remember. What were some of the major or minor bugs with SWP? I used it lot and didn't notice anything. But then I'm not a rabid fan that knows the game inside and out.

deuxsonic

#10 Posted 07 August 2016 - 10:17 PM

SWP hadn't evolved much past JFSW. EDuke32 has done all kinds of things that I can only dream of in SW, like not broken sound code, digital music, and a video renderer that can automatically make skyboxes which look much nicer when looking straight up/down.

FistMarine

#11 Posted 07 August 2016 - 10:54 PM

Honestly, I would rather prefer if SW gets integrated into EDuke32 and everyone would use that instead of using SWP.

Martin Howe

#12 Posted 07 August 2016 - 11:50 PM

FistMarine, on 07 August 2016 - 10:54 PM, said:

Honestly, I would rather prefer if SW gets integrated into EDuke32 and everyone would use that instead of using SWP.

So would I but Hendricks266 right now seems the only person who might have the expertise to do so and he seems to have enough on his plate. TX no doubt is too busy with EDuke32

So a less buggy SWP is about all we can hope for.

Martin Howe

#13 Posted 08 August 2016 - 01:06 AM

Here's the program as it currently stands: executable source

If you're using a very fussy web browser (e.g., Google Chrome) you may need to confirm the download.
There is no new functionality but it should be less buggy (though I do know of one or two to do with when music plays).
I have had the occasional savegame load crash but nowhere near the "it always does that" that some people have been reporting.

It just needs testing before submitting it to H266's repository in a pull request and I'd rather not do that until I'm sure I haven't put any new bugs in! Posted Image

For the programmers among you, the (col->f > 127) fix is redacted because it was probably not intended - the ALT HUD in the HRP textures looks like the original (non-minimalist) version SWP displayed in non-HRP mode when the "use 255" wasn't being acted on.

Again for the programmers among you, a diff (spoilered for size):

Spoiler


diff --normal -r swpthen/Build/Makefile swpnow/Build/Makefile
63a64
> 	-Wno-format -Wno-pointer-sign -Wno-return-type -Wno-sign-compare -Wno-type-limits -Wno-unused-but-set-parameter -Wno-unused-parameter \
diff --normal -r swpthen/Build/include/cache1d.h swpnow/Build/include/cache1d.h
21c21
< long	initgroupfile(char *filename);
---
> long	initgroupfile(const char *filename);
24c24
< long	kopen4load(char *filename, char searchfirst);	// searchfirst: 0 = anywhere, 1 = first group, 2 = any group
---
> long	kopen4load(const char *filename, char searchfirst);	// searchfirst: 0 = anywhere, 1 = first group, 2 = any group
diff --normal -r swpthen/Build/include/mmulti.h swpnow/Build/include/mmulti.h
12c12
< long initmultiplayersparms(long argc, char **argv);

---
> long initmultiplayersparms(long argc, const char **argv);

15c15
< void initmultiplayers(long argc, char **argv, char damultioption, char dacomrateoption, char dapriority);

---
> void initmultiplayers(long argc, const char **argv, char damultioption, char dacomrateoption, char dapriority);

diff --normal -r swpthen/Build/src/baselayer.c swpnow/Build/src/baselayer.c
0a1,2
> #include <strings.h>

> 

diff --normal -r swpthen/Build/src/cache1d.c swpnow/Build/src/cache1d.c
14a15,16
> #include <strings.h>

> 

25c27
< static long kzipopen(char *filnam)

---
> static long kzipopen(const char *filnam)

433c435
< long initgroupfile(char *filename)

---
> long initgroupfile(const char *filename)

570c572
< long kopen4load(char *filename, char searchfirst)

---
> long kopen4load(const char *filename, char searchfirst)

diff --normal -r swpthen/Build/src/config.c swpnow/Build/src/config.c
3a4,5
> #include <strings.h>

> 

diff --normal -r swpthen/Build/src/defs.c swpnow/Build/src/defs.c
11a12,13
> #include <strings.h>

> 

diff --normal -r swpthen/Build/src/engine.c swpnow/Build/src/engine.c
20a21,22
> #include <strings.h>
> 
diff --normal -r swpthen/Build/src/mmulti.c swpnow/Build/src/mmulti.c
266c266
< long initmultiplayersparms(long argc, char **argv)

---
> long initmultiplayersparms(long argc, const char **argv)

440c440
< void initmultiplayers (long argc, char **argv, char damultioption, char dacomrateoption, char dapriority)

---
> void initmultiplayers (long argc, const char **argv, char damultioption, char dacomrateoption, char dapriority)

diff --normal -r swpthen/Build/src/osd.c swpnow/Build/src/osd.c
4a5,6
> #include <strings.h>
> 
diff --normal -r swpthen/Build/src/scriptfile.c swpnow/Build/src/scriptfile.c
7a8,9
> #include <strings.h>

> 

diff --normal -r swpthen/Build/src/startwin.editor.c swpnow/Build/src/startwin.editor.c
7a8,9
> #include <strings.h>
> 
diff --normal -r swpthen/Build/src/winlayer.c swpnow/Build/src/winlayer.c
30a31,32
> #include <strings.h>
> 
74c76
< extern long app_main(long argc, char *argv[]);
---
> extern long app_main(long argc, const char *argv[]);
374c376
< 	FILE *fil;
---
> 	int handle;
376,377c378,379
< 	fil = kopen4load(gsv, 0);
< 	if (fil)
---
> 	handle = kopen4load(gsv, 0);
> 	if (handle)
379c381
< 		kclose(fil);
---
> 		kclose(handle);
448c450
< 	_buildargc = SetCommandLine(argvbuf); //&_buildargv);
---
> 	_buildargc = SetCommandLine(argvbuf);
576c578
< 		_buildargv = (char**)malloc(sizeof(char*)*x); //_buildargc);
---
> 		_buildargv = (const char**)malloc(sizeof(char*)*x);
diff --normal -r swpthen/Makefile swpnow/Makefile
39,40c39,49
< OURCFLAGS=$(debug) -W -Wall -Wimplicit -Wno-char-subscripts -Wno-unused \
< 	-funsigned-char -fno-strict-aliasing -DNO_GCC_BUILTINS \
---
> OURCFLAGS=$(debug) \
> 	\
> 	-Wall -Wextra \
> 	-Wno-char-subscripts \
> 	-Wno-pointer-sign \
> 	-Wno-unused \
> 	-Wno-unused-parameter \
> 	-funsigned-char \
> 	-fno-strict-aliasing \
> 	\
> 	-DNO_GCC_BUILTINS \
41a51
> 	-Wimplicit-int \
diff --normal -r swpthen/Source/anim.c swpnow/Source/anim.c
30a31,32
> #include <strings.h>
> 
483c485
< 		sprintf(fnam,"SWP%d0%s%d%s", anum+1, num, i, extn);
---
> 		sprintf(fnam,"SWP%d0%s%ld%s", anum+1, num, i, extn);
diff --normal -r swpthen/Source/cheats.c swpnow/Source/cheats.c
34a35,36
> #include <strings.h>
> 
diff --normal -r swpthen/Source/config.c swpnow/Source/config.c
57a58,59
> #include <strings.h>

> 

731c733
<   		Bsprintf(buf,"IPAddress_%ld",i+1);

---
>   		Bsprintf(buf,"IPAddress_%d",i+1);

860c862
<    if (buf[0] == NULL)

---
>    if (buf[0] == '\0')

913c915
<        Bsprintf(buf,"IPAddress_%ld",i+1);

---
>        Bsprintf(buf,"IPAddress_%d",i+1);

diff --normal -r swpthen/Source/console.c swpnow/Source/console.c
77c77
< BYTE CON_CommandCmp(char *str1, char *str2, long len);
---
> BYTE CON_CommandCmp(const char *str1, const char *str2, long len);
110c110
< 	char *command;              // Text string representing the command that calls this function
---
> 	const char *command;        // Text string representing the command that calls this function
209c209
< BYTE CON_CommandCmp(char *str1, char *str2, long len)
---
> BYTE CON_CommandCmp(const char *str1, const char *str2, long len)
211,212c211,212
< 	char *cp1 = str1;
< 	char *cp2 = str2;
---
> 	const char *cp1 = str1;
> 	const char *cp2 = str2;
233c233
< BOOL IsCommand(char *str)
---
> BOOL IsCommand(const char *str)
260c260
< void CON_Message(char *message, ...)
---
> void CON_Message(const char *message, ...)
276c276
< void CON_ConMessage(char *message, ...)
---
> void CON_ConMessage(const char *message, ...)
291c291
< void CON_StoreArg(char *userarg)
---
> void CON_StoreArg(const char *userarg)
304c304
< BOOL CON_CheckParm(char *userarg)
---
> BOOL CON_CheckParm(const char *userarg)
331c331
< void CON_AddHistory(char *commandstr)
---
> void CON_AddHistory(const char *commandstr)
347c347
< BOOL CON_AddCommand(char *command, /*BOOL*/void (*function)(void))
---
> BOOL CON_AddCommand(const char *command, /*BOOL*/void (*function)(void))
834a835,836
> #define MAXSPRWAL (MAXSPRITES < MAXWALLS ? MAXWALLS : MAXSPRITES)
> 
837c839
< 	char incache[8192]; // 8192 so it can index maxwalls as well
---
> 	char incache[MAXSPRWAL]; // V8 maps go up beyond 8192
841c843
< 	memset(incache,0,8192);
---
> 	memset(incache,0,MAXSPRWAL);
858c860
< 	for(i=0;i<8192;i++)
---
> 	for(i=0;i<MAXSPRWAL;i++)
864c866
< 	memset(incache,0,8192);
---
> 	memset(incache,0,MAXSPRWAL);
diff --normal -r swpthen/Source/draw.c swpnow/Source/draw.c
1415c1415
< 			sprintf(buffer, "ANGL : %ld", (LONG) pp->pang);

---
> 			sprintf(buffer, "ANGL : %d", pp->pang);

1418c1418
< 			sprintf(buffer, "SECT : %ld", pp->cursectnum);

---
> 			sprintf(buffer, "SECT : %d", pp->cursectnum);

diff --normal -r swpthen/Source/game.c swpnow/Source/game.c
359a360,361
> #include <strings.h>

> 

1731c1733
< 				if (LevelSong[0] == 0)

---
> 				if (LevelSong[0] == '\0')

1740c1742
< 			if (LevelSong[0] == NULL)

---
> 			if (LevelSong[0] == '\0')

3468c3470
< 			sprintf(ds,"%d/%d", kills[i], gNet.KillLimit);

---
> 			sprintf(ds,"%d/%ld", kills[i], gNet.KillLimit);

4075c4077
< VOID CheckCommandLine(long argc, char *argv[])

---
> VOID CheckCommandLine(long argc, const char *argv[])

4078c4080
< 	char TempStr[255];

---
> 	char TempStr[4096];

4094a4097
> 	char argstr[256];

4097,4098c4100,4102
< 		char *arg = argv[cnt];   // argv[1] = /net | argv[2] = /n1 | argv[3] = 192.168.0.2 | argv[4] = 192.168.0.4

< 		if (*arg != '/' && *arg != '-') continue;

---
> 		strcpy(argstr, argv[cnt]); // fix const issues with string comparison fns

> 		char *arg = &argstr[0];

> 		if (*arg != '/' && *arg != '-') continue;

4666c4670
< long app_main(long argc, char *argv[])

---
> long app_main(long argc, const char *argv[])

diff --normal -r swpthen/Source/game.h swpnow/Source/game.h
911,914c911,914
< void CON_Message(char *message, ...);
< void CON_ConMessage(char *message, ...);
< void CON_StoreArg(char *userarg);
< BOOL CON_CheckParm(char *userarg);
---
> void CON_Message(const char *message, ...);
> void CON_ConMessage(const char *message, ...);
> void CON_StoreArg(const char *userarg);
> BOOL CON_CheckParm(const char *userarg);
916c916
< BOOL CON_AddCommand(char *command, /*BOOL*/void (*function)(void));
---
> BOOL CON_AddCommand(const char *command, /*BOOL*/void (*function)(void));
diff --normal -r swpthen/Source/gamep.h swpnow/Source/gamep.h
926a927,928
> //FIXME - *pic etc should be intptr_t for max safety

> 

1025c1027
< 	int i, j, xsiz, ysiz, tile, *picptr;

---
> 	long i, j, xsiz, ysiz, tile, *picptr;

1029c1031
< 	kloadhud((intptr_t *)&picptr, &j, &xsiz, &ysiz);

---
> 	kloadhud((long *)&picptr, &j, &xsiz, &ysiz);

1037,1041c1039,1043
< 			if (col->f < 0)

< 			{

< 				faketiledata[tile][i*ysiz+j] = 255;  // transparent

< 				continue;

< 			}

---
> //          if (col->f > 127)

> //          {

> //            faketiledata[tile][i*ysiz+j] = 255;  // transparent

> //            continue;

> //          }

1052c1054
< 	kloaduzi((intptr_t *)&picptr, &j, &xsiz, &ysiz);

---
> 	kloaduzi((long *)&picptr, &j, &xsiz, &ysiz);

1060,1064c1062,1066
< 			if (col->f < 0)

< 			{

< 				faketiledata[tile][i*ysiz+j] = 255;  // transparent

< 				continue;

< 			}

---
> //          if (col->f > 127)

> //          {

> //            faketiledata[tile][i*ysiz+j] = 255;  // transparent

> //            continue;

> //          }

1075c1077
< 	kloadriot((intptr_t *)&picptr, &j, &xsiz, &ysiz);

---
> 	kloadriot((long *)&picptr, &j, &xsiz, &ysiz);

1083,1087c1085,1089
< 			if (col->f < 0)

< 			{

< 				faketiledata[tile][i*ysiz+j] = 255;  // transparent

< 				continue;

< 			}

---
> //          if (col->f > 127)

> //          {

> //            faketiledata[tile][i*ysiz+j] = 255;  // transparent

> //            continue;

> //          }

diff --normal -r swpthen/Source/jaudiolib/dsoundout.c swpnow/Source/jaudiolib/dsoundout.c
264c264
< 	hr = IDirectSoundBuffer_QueryInterface(lpDSBSecondary, &IID_IDirectSoundNotify, &lpDSNotify);
---
> 	hr = IDirectSoundBuffer_QueryInterface(lpDSBSecondary, &IID_IDirectSoundNotify, (void **)&lpDSNotify);
402c402,409
< 		if (!(rv >= WAIT_OBJECT_0 && rv <= WAIT_OBJECT_0+1+_DSOUND_NumBuffers)) return -1;
---
> 		// Failed?
> 		if (rv == 0xFFFFFFFF) return 0xFFFFFFFF; // NOT -1 -- DWORD is unsigned!!
> 
> 		// Remove dependency on actual value of WAIT_OBJECT_*
> #pragma GCC diagnostic push
> #pragma GCC diagnostic ignored "-Wtype-limits"
> 		if (!(rv >= WAIT_OBJECT_0 && rv <= WAIT_OBJECT_0+1+(unsigned)_DSOUND_NumBuffers)) return 0xFFFFFFFF;
> #pragma GCC diagnostic pop
diff --normal -r swpthen/Source/jaudiolib/mpu401.c swpnow/Source/jaudiolib/mpu401.c
36a37
> #include <stdint.h>
119c120
< 				if (dwParam1 == (long)&bufferheaders[i]) {
---
> 				if (dwParam1 == (uintptr_t)&bufferheaders[i]) {
262c263
< 	if (midiStreamOpen(&hmido,&mididevice,1,(DWORD)MPU_MIDICallback,0L,CALLBACK_FUNCTION) != MMSYSERR_NOERROR) return(MPU_Error);
---
> 	if (midiStreamOpen(&hmido,(LPUINT)&mididevice,1,(DWORD)MPU_MIDICallback,0L,CALLBACK_FUNCTION) != MMSYSERR_NOERROR) return(MPU_Error);
471,472c472
< 	if (mididevice < 0) return 0;
< 
---
> //	if (mididevice < 0) return 0;
diff --normal -r swpthen/Source/jaudiolib/multivoc.c swpnow/Source/jaudiolib/multivoc.c
220a221,223
>   	case MV_NotImplemented:
>          ErrorString = "Function not (yet) implemented";
> 
608c611
<                ( voice->LoopStart >= ( ptr - 4 ) ) )
---
>                ( voice->LoopStart >= (char *)( ptr - 4 ) ) )
1736c1739
<    MV_ReverbDelay = max( MixBufferSize, min( delay, maxdelay ) );
---
>    MV_ReverbDelay = max( MixBufferSize, (unsigned)min( delay, maxdelay ) );
2311c2314
<    loopend    = min( loopend, data->size );
---
>    loopend    = min( loopend, (long)data->size );
2330c2333
<    if ( ( loopstart >= data->size ) || ( loopstart < 0 ) )
---
>    if ( ( loopstart >= (long)data->size ) || ( loopstart < 0 ) )
2514a2518,2519
> 	MV_SetErrorCode( MV_NotImplemented );
> 	return( MV_Error );
diff --normal -r swpthen/Source/jaudiolib/multivoc.h swpnow/Source/jaudiolib/multivoc.h
57c57,58
<    MV_NullRecordFunction
---
>    MV_NullRecordFunction,
>    MV_NotImplemented
diff --normal -r swpthen/Source/jmact/keyboard.c swpnow/Source/jmact/keyboard.c
34a35,36
> #include <strings.h>
> 
diff --normal -r swpthen/Source/jmact/scriplib.c swpnow/Source/jmact/scriplib.c
42a43
> #include <strings.h>
diff --normal -r swpthen/Source/jmact/util_lib.c swpnow/Source/jmact/util_lib.c
33a34,35
> #include <strings.h>
> 
diff --normal -r swpthen/Source/menus.c swpnow/Source/menus.c
101a102,103
> #include <strings.h>

> 

192c194
< BOOL MNU_DoPlayerName(void);

---
> BOOL MNU_DoPlayerName(UserCall call, MenuItem * item);

194c196
< BOOL MNU_DoIpAddress(void);

---
> BOOL MNU_DoIpAddress(UserCall call, MenuItem * item);

230c232
< BOOL MNU_TeamPlayChange(MenuItem *item);

---
> BOOL MNU_TeamPlayChange(void);

305c307
< static BOOL ApplyModeSettings(MenuItem *item)

---
> static BOOL ApplyModeSettings(void)

498c500
< BOOL MNU_MapKeyIn(void);

---
> BOOL MNU_MapKeyIn(UserCall call, MenuItem *item);

536c538
< BOOL MNU_MusicKeyIn(void);

---
> BOOL MNU_MusicKeyIn(UserCall call, MenuItem *item);

2762c2764
<        sprintf(SaveGameInfo4, "Time: %d mins - %d secs", (second_tics/60), (second_tics%60));

---
>        sprintf(SaveGameInfo4, "Time: %ld mins - %ld secs", (second_tics/60), (second_tics%60));

3008c3010,3021
< BOOL MNU_TeamPlayChange(MenuItem *item)

---
> // Temporary hack for MNU_TeamPlayChange(),

> // as it requires a menu item. This sort of

> // thing should really be done the way DOOM

> // does the frame table (union of stuff like

> // actionf_v, actionf_p1, etc); but for this

> // one exception, it will have to do for now.

> //

> // Set in function MNU_DoItem() whenever

> // MNU_TeamPlayChange() might be called.

> MenuItem *itm_TeamPlayChange = NULL;

> 

> BOOL MNU_TeamPlayChange(void)

3011c3024,3027
< 		SET(item->flags, mf_disabled);

---
> 	{

> 		SET(itm_TeamPlayChange->flags, mf_disabled);

> 		itm_TeamPlayChange = NULL;

> 	}

4341a4358
> 

4359a4377,4378
> 	itm_TeamPlayChange = item; // just in case

> 

4398c4417,4420
< 	if (currentmenu->text > 0 && menucmp(sText, "^Episode") != 0 && menucmp(sText, "^Skill") != 0 && menucmp(sText, "^Options") != 0)

---
> 	if ((intptr_t)currentmenu->text > 0 &&

> 		menucmp(sText, "^Episode") != 0 &&

> 		menucmp(sText, "^Skill") != 0 &&

> 		menucmp(sText, "^Options") != 0)

5466c5488
< BOOL MNU_DoIpAddress(void)

---
> BOOL MNU_DoIpAddress(UserCall call, MenuItem * item)

5542c5564
< BOOL MNU_DoPlayerName(void)

---
> BOOL MNU_DoPlayerName(UserCall call, MenuItem * item)

5865c5887
< BOOL MNU_MapKeyIn(void)

---
> BOOL MNU_MapKeyIn(UserCall call, MenuItem *item)

5967c5989
< BOOL MNU_MusicKeyIn(void)

---
> BOOL MNU_MusicKeyIn(UserCall call, MenuItem *item)

6081c6103
< 	sprintf(ds,"%d",gNet.KillLimit);

---
> 	sprintf(ds,"%ld",gNet.KillLimit);

diff --normal -r swpthen/Source/menus.h swpnow/Source/menus.h
295c295
< 	long x, y;                          // Menu x,y position on screen.

---
> 	long x, y;                          // Menu x,y position on screen.`

341c341
< BOOL MNU_DoPlayerName(void);

---
> BOOL MNU_DoPlayerName(UserCall call, MenuItem * item);

343c343
< BOOL MNU_DoIpAddress(void);

---
> BOOL MNU_DoIpAddress(UserCall call, MenuItem * item);

diff --normal -r swpthen/Source/panel.c swpnow/Source/panel.c
1073c1073
< 		return;

---
> 		return(FALSE);

1078c1078
< 		return;

---
> 		return(FALSE);

1974c1974
< 			WeaponOK(psp->PlayerP);

---
> 			(void) WeaponOK(psp->PlayerP);

2769c2769
< 			WeaponOK(psp->PlayerP);

---
> 			(void) WeaponOK(psp->PlayerP);

3522c3522
< 			WeaponOK(psp->PlayerP);

---
> 			(void) WeaponOK(psp->PlayerP);

3884c3884
< 	WeaponOK(psp->PlayerP);

---
> 	(void) WeaponOK(psp->PlayerP);

3919c3919
< 			WeaponOK(psp->PlayerP);

---
> 			(void) WeaponOK(psp->PlayerP);

4224c4224
< 					WeaponOK(psp->PlayerP);

---
> 					(void) WeaponOK(psp->PlayerP);

4323c4323
<                WeaponOK(psp->PlayerP);

---
>                (void) WeaponOK(psp->PlayerP);

4333c4333
< 			WeaponOK(psp->PlayerP);

---
> 			(void) WeaponOK(psp->PlayerP);

4897c4897
< 				WeaponOK(psp->PlayerP);

---
> 				(void) WeaponOK(psp->PlayerP);

4916c4916
< 			WeaponOK(psp->PlayerP);

---
> 			(void) WeaponOK(psp->PlayerP);

5216c5216
< 		WeaponOK(psp->PlayerP);

---
> 		(void) WeaponOK(psp->PlayerP);

5773c5773
< 			WeaponOK(psp->PlayerP);

---
> 			(void) WeaponOK(psp->PlayerP);

6013c6013
< 			WeaponOK(psp->PlayerP);

---
> 			(void) WeaponOK(psp->PlayerP);

diff --normal -r swpthen/Source/player.c swpnow/Source/player.c
7592c7592,7593
< int PlayerStateControl(SHORT SpriteNum)
---
> VOID
> PlayerStateControl(SHORT SpriteNum)
7648c7649
< 	return (0);
---
> 	return;
diff --normal -r swpthen/Source/save.c swpnow/Source/save.c
33a34,35
> #include <strings.h>
> 
diff --normal -r swpthen/Source/scrip2.c swpnow/Source/scrip2.c
31a32,33
> #include <strings.h>
> 
diff --normal -r swpthen/Source/sounds.c swpnow/Source/sounds.c
32a33,34
> #include <strings.h>
> 
diff --normal -r swpthen/Source/sprite.c swpnow/Source/sprite.c
38a39,40
> #include <strings.h>

> 

6983c6985
< 		if (u <= 0)

---
> 		if ((intptr_t)u <= 0)

diff --normal -r swpthen/Source/startwin.game.c swpnow/Source/startwin.game.c
34a35,36
> #include <strings.h>
> 
276c278
< 	else
---
> 	else // (MusicDevice is zero or positive)
278c280
< 		if (MusicDevice >= nummididevs)
---
> 		if ((uint32)MusicDevice >= nummididevs)
diff --normal -r swpthen/Source/swp.h swpnow/Source/swp.h
30c30
< long initgroupfile(char *filename);
---
> long initgroupfile(const char *filename);
diff --normal -r swpthen/Source/text.c swpnow/Source/text.c
290c290
< 	Bsnprintf(b,10,"%ld",number);
---
> 	Bsnprintf(b,10,"%d",number);
diff --normal -r swpthen/Source/weapon.c swpnow/Source/weapon.c
20751c20751
< 		hitsect = sp->sectnum;
---
> 		// hitsect = sp->sectnum; // Not used so commented out - MH

Albinoid

#14 Posted 02 September 2016 - 09:32 AM

Martin Howe, on 08 August 2016 - 01:06 AM, said:

Excited to check this out.

A little bit of background before I get started - I originally tried running Hendricks's 4.3.3 build and ran into an issue, noted here: http://swforum05.pro...s.com/post/1086
Yes, I was (and still am) running Vista. Yes, I'm aware it isn't great, though hopefully it isn't what turns out to be the impedance on possibly squashing any bugs.

That outta the way, I've downloaded and ran your executable with the Sw.GRP yoinked from the free Steam download of the old Shadow Warrior and... it works! Well, kinda.

I can get it up and running past the launcher without problems (or rather the same problem I was running into with the last build Hendricks had done) so that's a definite plus.

But something new comes up when playing after what seems like a random amount of time (I've not been clocking it and... as far as I can tell you don't have anything outputting crash dialogue (? though maybe I'm missing it) so it'd be a rough guess unless I break out the stopwatch): that is, the game will just stop. The screen will go black for a brief moment, then I'm kicked back to the desktop with the routine "xxxx has stopped working" Windows notice. It's happened twice to me thus far.

Just out of personal curiosity (and being somewhat aware that I probably shouldn't do it), I decided to be cheeky and swap out the SWP.exe in Hendricks's 4.3.3 build directory with your SWP.exe and see what happened. The end result was more or less the same, at least based on what was output to the crash log (which potentially will be of no use to you or it might?):

Caught exception 0xC0000002 at 0x75CD012F: {Not Implemented}

The requested operation is not implemented.


0x75CD012F : C:\Windows\syswow64\kernel32.dll : RaiseException
0x62EE2878 : C:\Windows\system32\WindowsCodecs.dll : WICCreateColorContext_Proxy
0x62E4ED87 : C:\Windows\system32\WindowsCodecs.dll : DllGetClassObject
0x62E370B1 : C:\Windows\system32\WindowsCodecs.dll : DllGetClassObject
0x62E37026 : C:\Windows\system32\WindowsCodecs.dll : DllGetClassObject
0x62E36F98 : C:\Windows\system32\WindowsCodecs.dll : DllGetClassObject
0x62E3A7C5 : C:\Windows\system32\WindowsCodecs.dll : DllGetClassObject
0x62E5282D : C:\Windows\system32\WindowsCodecs.dll : DllGetClassObject
0x62E281AC : C:\Windows\system32\WindowsCodecs.dll : [unknown file]
0x6EDF16BA : C:\Windows\system32\IconCodecService.dll : [unknown file]
0x758CA3E7 : C:\Windows\syswow64\USER32.dll : MessageBoxIndirectW
0x758BB730 : C:\Windows\syswow64\USER32.dll : DdeInitializeW
0x758B6B6A : C:\Windows\syswow64\USER32.dll : LoadStringA
0x758D6E79 : C:\Windows\syswow64\USER32.dll : CreateIconFromResource
0x758D9121 : C:\Windows\syswow64\USER32.dll : DdeConnectList
0x77BDE4B6 : C:\Windows\SysWOW64\ntdll.dll : KiUserCallbackDispatcher
0x72CD6567 : C:\Windows\system32\DDRAW.dll : GetSurfaceFromDC
0x72CD67DF : C:\Windows\system32\DDRAW.dll : GetSurfaceFromDC
0x72CD7223 : C:\Windows\system32\DDRAW.dll : GetSurfaceFromDC
0x0050B8FA : C:\Users\Albinoid\Desktop\swp_433_beta3\SWP.exe : [unknown file]
0x77C0E54E : C:\Windows\SysWOW64\ntdll.dll : tan
0x77C144CC : C:\Windows\SysWOW64\ntdll.dll : RtlAllocateHeap
0x77BED38A : C:\Windows\SysWOW64\ntdll.dll : RtlNtStatusToDosError
0x016857A8 : [unknown module] : [unknown file]
0x003A0043 : [unknown module] : [unknown file]
0x0057005C : C:\Users\Albinoid\Desktop\swp_433_beta3\SWP.exe : [unknown file]
0x00650073 : C:\Users\Albinoid\Desktop\swp_433_beta3\SWP.exe : [unknown file]
0x00730072 : C:\Users\Albinoid\Desktop\swp_433_beta3\SWP.exe : [unknown file]
0x004F005C : C:\Users\Albinoid\Desktop\swp_433_beta3\SWP.exe : [unknown file]
0x006E0077 : C:\Users\Albinoid\Desktop\swp_433_beta3\SWP.exe : [unknown file]
0x00720065 : C:\Users\Albinoid\Desktop\swp_433_beta3\SWP.exe : [unknown file]
0x0044005C : C:\Users\Albinoid\Desktop\swp_433_beta3\SWP.exe : [unknown file]
0x00730065 : C:\Users\Albinoid\Desktop\swp_433_beta3\SWP.exe : [unknown file]
0x0074006B : C:\Users\Albinoid\Desktop\swp_433_beta3\SWP.exe : [unknown file]
0x0070006F : C:\Users\Albinoid\Desktop\swp_433_beta3\SWP.exe : [unknown file]
0x0073005C : C:\Users\Albinoid\Desktop\swp_433_beta3\SWP.exe : [unknown file]
0x00700077 : C:\Users\Albinoid\Desktop\swp_433_beta3\SWP.exe : [unknown file]
0x0034005F : [unknown module] : [unknown file]
0x00330033 : [unknown module] : [unknown file]
0x0062005F : C:\Users\Albinoid\Desktop\swp_433_beta3\SWP.exe : [unknown file]
0x00740065 : C:\Users\Albinoid\Desktop\swp_433_beta3\SWP.exe : [unknown file]
0x00330061 : [unknown module] : [unknown file]
0x0053005C : C:\Users\Albinoid\Desktop\swp_433_beta3\SWP.exe : [unknown file]
0x00500057 : C:\Users\Albinoid\Desktop\swp_433_beta3\SWP.exe : [unknown file]
0x0065002E : C:\Users\Albinoid\Desktop\swp_433_beta3\SWP.exe : [unknown file]
0x00650078 : C:\Users\Albinoid\Desktop\swp_433_beta3\SWP.exe : [unknown file]
0x00700000 : C:\Users\Albinoid\Desktop\swp_433_beta3\SWP.exe : [unknown file]
0x00620064 : C:\Users\Albinoid\Desktop\swp_433_beta3\SWP.exe : [unknown file]
0x00700000 : C:\Users\Albinoid\Desktop\swp_433_beta3\SWP.exe : [unknown file]
0x00620064 : C:\Users\Albinoid\Desktop\swp_433_beta3\SWP.exe : [unknown file]
0x00650000 : C:\Users\Albinoid\Desktop\swp_433_beta3\SWP.exe : [unknown file]
0x0070006C : C:\Users\Albinoid\Desktop\swp_433_beta3\SWP.exe : [unknown file]
0x0070002E : C:\Users\Albinoid\Desktop\swp_433_beta3\SWP.exe : [unknown file]
0x00620064 : C:\Users\Albinoid\Desktop\swp_433_beta3\SWP.exe : [unknown file]
0x00730000 : C:\Users\Albinoid\Desktop\swp_433_beta3\SWP.exe : [unknown file]
0x0070002E : C:\Users\Albinoid\Desktop\swp_433_beta3\SWP.exe : [unknown file]
0x00620064 : C:\Users\Albinoid\Desktop\swp_433_beta3\SWP.exe : [unknown file]
0x00640000 : C:\Users\Albinoid\Desktop\swp_433_beta3\SWP.exe : [unknown file]

And I decided to give the Hendricks build another run just in case it was a freak occurrence back in March that was causing me issues. No joy there, as I appear to have received the same crash log.

Caught exception 0xC0000002 at 0x74AC012F: {Not Implemented}

The requested operation is not implemented.


0x74AC012F : C:\Windows\syswow64\kernel32.dll : RaiseException
0x64962878 : C:\Windows\system32\WindowsCodecs.dll : WICCreateColorContext_Proxy
0x648CED87 : C:\Windows\system32\WindowsCodecs.dll : DllGetClassObject
0x648B70B1 : C:\Windows\system32\WindowsCodecs.dll : DllGetClassObject
0x648B7026 : C:\Windows\system32\WindowsCodecs.dll : DllGetClassObject
0x648B6F98 : C:\Windows\system32\WindowsCodecs.dll : DllGetClassObject
0x648BA7C5 : C:\Windows\system32\WindowsCodecs.dll : DllGetClassObject
0x648D282D : C:\Windows\system32\WindowsCodecs.dll : DllGetClassObject
0x648A81AC : C:\Windows\system32\WindowsCodecs.dll : [unknown file]
0x68FF16BA : C:\Windows\system32\IconCodecService.dll : [unknown file]
0x75FBA3E7 : C:\Windows\syswow64\USER32.dll : MessageBoxIndirectW
0x75FAB730 : C:\Windows\syswow64\USER32.dll : DdeInitializeW
0x75FA6B6A : C:\Windows\syswow64\USER32.dll : LoadStringA
0x75FC6E79 : C:\Windows\syswow64\USER32.dll : CreateIconFromResource
0x75FC9121 : C:\Windows\syswow64\USER32.dll : DdeConnectList
0x76F5E4B6 : C:\Windows\SysWOW64\ntdll.dll : KiUserCallbackDispatcher
0x70376567 : C:\Windows\system32\DDRAW.dll : GetSurfaceFromDC
0x703767DF : C:\Windows\system32\DDRAW.dll : GetSurfaceFromDC
0x70377223 : C:\Windows\system32\DDRAW.dll : GetSurfaceFromDC
0x005698A7 : C:\Users\Albinoid\Desktop\swp_433_beta3\SWP.exe : [unknown file]
0x00566772 : C:\Users\Albinoid\Desktop\swp_433_beta3\SWP.exe : [unknown file]
0x00542E19 : C:\Users\Albinoid\Desktop\swp_433_beta3\SWP.exe : [unknown file]
0x0041C8AF : C:\Users\Albinoid\Desktop\swp_433_beta3\SWP.exe : [unknown file]
0x004236E5 : C:\Users\Albinoid\Desktop\swp_433_beta3\SWP.exe : [unknown file]
0x00423CB0 : C:\Users\Albinoid\Desktop\swp_433_beta3\SWP.exe : [unknown file]
0x004277B1 : C:\Users\Albinoid\Desktop\swp_433_beta3\SWP.exe : [unknown file]
0x00429AD1 : C:\Users\Albinoid\Desktop\swp_433_beta3\SWP.exe : [unknown file]
0x0056311D : C:\Users\Albinoid\Desktop\swp_433_beta3\SWP.exe : [unknown file]
0x0056FCED : C:\Users\Albinoid\Desktop\swp_433_beta3\SWP.exe : [unknown file]
0x004013E2 : C:\Users\Albinoid\Desktop\swp_433_beta3\SWP.exe : [unknown file]
0x74B2F964 : C:\Windows\syswow64\kernel32.dll : BaseThreadInitThunk
0x76FBE369 : C:\Windows\SysWOW64\ntdll.dll : RtlCreateUserProcess
0x76FBE57B : C:\Windows\SysWOW64\ntdll.dll : RtlCreateProcessParameters

Martin Howe

#15 Posted 28 November 2016 - 02:45 PM

Ouch. Odd that I should come here at a time like this. I was going to vent about the awful state of the source code :mellow:

Seriously, I am fed up with Microsoft's attitude and am fearful of a move to software as a subscription when Windows 7 runs out. So I am switching to Linux. Only games are in my way now.

ZDoom, GZDoom, EDuke32 - built and run fine.
Half a dozen Quake 1 ports build OK and run. Still choosing. Will probably go with the latest incarnation of FitzQuake, which apparently is QuakeSpasm. Not played Quake seriously for years. Oh and I ran Tenebrae but did not inhale (too dark).

However, SWP is another matter. The source code is practically un-buildable on Linux. Dear God, while you are blessing America, please spare a little time to curse something as well. Specifically, Australia, South Africa and whatever pit of Hell spawned Ken. Oh, bother, that one IS America. Can't curse them. Trust me God, you can easily change the laws of physics to resolve this paradox. But try changing the source of SWP and we'll need a new god. The SWP source is a tapeworm-ridden, toxicaragondii-infested pile of dog turd. How the hell that mess ever compiled to a working program given all the defines, redefines, macros, compatibility layers and other obfuscation I will never know. /RANT

So right now I will not likely be running SWP on Windows again, never mind building it. All I did is make it a little less flakey than before. However, I don't like the thought of random crashes so at some point once I have enough time and have ingested enough alcohol to give me the required Dutch courage, I will have a look at building SWP again. I may be gone some time.

icecoldduke

#16 Posted 28 November 2016 - 05:33 PM

Martin Howe, on 28 November 2016 - 02:45 PM, said:

The source code is [/size]practically[size="2"] un-buildable on Linux.

The shadow warrior code base isn't the worst code base I've seen in my carrier. I agree its convoluted in places, but its definitely not as bad as your making it seem. As far as getting it to compile on Linux, if your good at software development, you can get it to compile on Linux. It took me a week I think to get the dos SW code ported to EDuke32 and have it run on Windows.

This post has been edited by icecoldduke: 28 November 2016 - 05:34 PM

Hendricks266

Weaponized Autism

#17 Posted 28 November 2016 - 11:27 PM

Shadow Warrior and JFSW's code is fine. SWP... was only ever meant to build on Windows.

Martin Howe

#18 Posted 01 December 2016 - 02:06 AM

LOL you may think so but the "latest" JFSW has various issues "out of the box" (I tried it) and SWP will need a lot of work to get it natively on Linux. It also means getting to grips with graphics programming and associated standards such as OpenGL or on Windows DX, which is a new venture for me, so there is a lot to take in; my background is data processing, engine logic and so forth, not putting pretty pictures on a screen (if you can call the Cycloid Emperor pretty

)

Nothing I can't handle, and it will be sorted eventually one way or the other -- but I'd rather be playing games than getting them to work :mellow: