zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2024-11-16 01:11:44 +00:00
Code Issues Projects Releases Packages Wiki Activity

Update nedmalloc.dll and fix undesirable FIRE/FIRE2 and COOLEXPLOSION1 behavior from http://forums.duke4.net/index.php?showtopic=2961&st=90&start=90

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@1827 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx 2011-03-05 03:57:15 +00:00
parent 1a8f02a07b
commit bcc3682af0
6 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
polymer/eduke32/build/src/winlayer.c
View file

@ -594,7 +594,7 @@ static void win_printversion(void)
if (largepagesavailable) if (largepagesavailable)
initprintf("Large page support available\n"); initprintf("Large page support available\n");
#else #else
initprintf(nedhandle ? "w/ nedmalloc.dll\n" : "\n"); initprintf(nedhandle ? "\nInitialized nedmalloc\n" : "\n");
#endif #endif
} }

BIN
polymer/eduke32/nedmalloc.dll
View file

Binary file not shown.

3
polymer/eduke32/source/actors.c
View file

@ -2913,7 +2913,7 @@ ACTOR_STATIC void G_MoveWeapons(void)
if (s->picnum == COOLEXPLOSION1) if (s->picnum == COOLEXPLOSION1)
{ {
if ((j&49152) == 49152 && sprite[j&(MAXSPRITES-1)].picnum != APLAYER) if ((j&49152) == 49152 && sprite[j&(MAXSPRITES-1)].picnum != APLAYER)
goto BOLT; goto COOLEXPLOSION;
s->xvel = 0; s->xvel = 0;
s->zvel = 0; s->zvel = 0;
} }
@ -3085,6 +3085,7 @@ ACTOR_STATIC void G_MoveWeapons(void)
} }
if (s->picnum == COOLEXPLOSION1) if (s->picnum == COOLEXPLOSION1)
{ {
COOLEXPLOSION:
s->shade++; s->shade++;
if (s->shade >= 40) KILLIT(i); if (s->shade >= 40) KILLIT(i);
} }

3
polymer/eduke32/source/game.c
View file

@ -6365,6 +6365,7 @@ skip:
break; break;
case FIRE__STATIC: case FIRE__STATIC:
case FIRE2__STATIC: case FIRE2__STATIC:
t->cstat |= 128;
case BURNING__STATIC: case BURNING__STATIC:
case BURNING2__STATIC: case BURNING2__STATIC:
if (sprite[s->owner].picnum != TREE1 && sprite[s->owner].picnum != TREE2) if (sprite[s->owner].picnum != TREE1 && sprite[s->owner].picnum != TREE2)
@ -9156,7 +9157,7 @@ static void G_Startup(void)
} }
for (i=0; i<MAXPLAYERS; i++) for (i=0; i<MAXPLAYERS; i++)
g_player[i].playerreadyflag = 0; g_player[i].pingcnt = 0;
if (quitevent) if (quitevent)
{ {

8
polymer/eduke32/source/net.c
View file

@ -2039,7 +2039,7 @@ void Net_ParseServerPacket(ENetEvent *event)
break; break;
case PACKET_PLAYER_PING: case PACKET_PLAYER_PING:
g_player[0].playerreadyflag++; g_player[0].pingcnt++;
return; return;
case PACKET_FRAG: case PACKET_FRAG:
@ -2247,7 +2247,7 @@ void Net_ParseClientPacket(ENetEvent *event)
packbuf[1] = myconnectindex; packbuf[1] = myconnectindex;
enet_peer_send(event->peer, CHAN_GAMESTATE, enet_packet_create(packbuf, 2, ENET_PACKET_FLAG_RELIABLE)); enet_peer_send(event->peer, CHAN_GAMESTATE, enet_packet_create(packbuf, 2, ENET_PACKET_FLAG_RELIABLE));
} }
g_player[other].playerreadyflag++; g_player[other].pingcnt++;
return; return;
case PACKET_MESSAGE: case PACKET_MESSAGE:
@ -3197,7 +3197,7 @@ void Net_EnterMessage(void)
void Net_WaitForServer(void) void Net_WaitForServer(void)
{ {
int32_t server_ready = g_player[0].playerreadyflag; int32_t server_ready = g_player[0].pingcnt;
if (numplayers < 2 || g_netServer) return; if (numplayers < 2 || g_netServer) return;
@ -3226,7 +3226,7 @@ void Net_WaitForServer(void)
handleevents(); handleevents();
Net_GetPackets(); Net_GetPackets();
if (g_player[0].playerreadyflag > server_ready) if (g_player[0].pingcnt > server_ready)
{ {
P_SetGamePalette(g_player[myconnectindex].ps, BASEPAL, 11); P_SetGamePalette(g_player[myconnectindex].ps, BASEPAL, 11);
return; return;

2
polymer/eduke32/source/player.h
View file

@ -213,7 +213,7 @@ typedef struct {
int32_t pcolor, pteam; int32_t pcolor, pteam;
uint8_t frags[MAXPLAYERS], wchoice[MAX_WEAPONS]; uint8_t frags[MAXPLAYERS], wchoice[MAX_WEAPONS];
char vote, gotvote, playerreadyflag, playerquitflag; char vote, gotvote, pingcnt, playerquitflag;
char user_name[32]; char user_name[32];
} playerdata_t; } playerdata_t;
#pragma pack(pop) #pragma pack(pop)