mirror of
https://github.com/ZDoom/raze-gles.git
synced 2024-12-25 03:00:46 +00:00
Fix some 64 bit casts.
git-svn-id: https://svn.eduke32.com/eduke32@1597 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
parent
386a93c366
commit
eb464d45f9
3 changed files with 4 additions and 4 deletions
|
@ -889,7 +889,7 @@ void Net_SyncPlayer(ENetEvent * event)
|
||||||
// no slots empty from players quitting, so open a new one
|
// no slots empty from players quitting, so open a new one
|
||||||
if (i == -1)
|
if (i == -1)
|
||||||
i = playerswhenstarted++;
|
i = playerswhenstarted++;
|
||||||
event->peer->data = (void *)i;
|
event->peer->data = (void *) ((intptr_t) i);
|
||||||
|
|
||||||
clearbufbyte(&g_player[i].playerquitflag,1,0x01010101);
|
clearbufbyte(&g_player[i].playerquitflag,1,0x01010101);
|
||||||
g_player[i].movefifoend = 1;
|
g_player[i].movefifoend = 1;
|
||||||
|
|
|
@ -1227,7 +1227,7 @@ static int32_t C_SkipComments(void)
|
||||||
initprintf("%s:%d: debug: EOF in comment!\n",g_szScriptFileName,g_lineNumber);
|
initprintf("%s:%d: debug: EOF in comment!\n",g_szScriptFileName,g_lineNumber);
|
||||||
C_ReportError(-1);
|
C_ReportError(-1);
|
||||||
initprintf("%s:%d: error: found `/*' with no `*/'.\n",g_szScriptFileName,g_lineNumber);
|
initprintf("%s:%d: error: found `/*' with no `*/'.\n",g_szScriptFileName,g_lineNumber);
|
||||||
g_parsingActorPtr = (intptr_t *)(g_processingState = g_numBraces = 0);
|
g_parsingActorPtr = 0;g_processingState = g_numBraces = 0;
|
||||||
g_numCompilerErrors++;
|
g_numCompilerErrors++;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
|
@ -289,13 +289,13 @@ int32_t S_PlayMusic(const char *fn, const int32_t sel)
|
||||||
char *ofn = (char *)fn;
|
char *ofn = (char *)fn;
|
||||||
int32_t fp;
|
int32_t fp;
|
||||||
char * testfn, * extension;
|
char * testfn, * extension;
|
||||||
int32_t alt = 0;
|
const char* alt = 0;
|
||||||
|
|
||||||
if (ud.config.MusicToggle == 0) return 0;
|
if (ud.config.MusicToggle == 0) return 0;
|
||||||
if (ud.config.MusicDevice < 0) return 0;
|
if (ud.config.MusicDevice < 0) return 0;
|
||||||
|
|
||||||
if (MapInfo[sel].alt_musicfn != NULL)
|
if (MapInfo[sel].alt_musicfn != NULL)
|
||||||
alt = (int32_t)(fn = MapInfo[sel].alt_musicfn);
|
alt = fn = MapInfo[sel].alt_musicfn;
|
||||||
|
|
||||||
|
|
||||||
testfn = (char *) Bmalloc(strlen(fn) + 5);
|
testfn = (char *) Bmalloc(strlen(fn) + 5);
|
||||||
|
|
Loading…
Reference in a new issue