diff --git a/polymer/eduke32/build/src/winlayer.c b/polymer/eduke32/build/src/winlayer.c index 38368ce12..4bb5d6f3d 100644 --- a/polymer/eduke32/build/src/winlayer.c +++ b/polymer/eduke32/build/src/winlayer.c @@ -594,7 +594,7 @@ static void win_printversion(void) if (largepagesavailable) initprintf("Large page support available\n"); #else - initprintf(nedhandle ? "w/ nedmalloc.dll\n" : "\n"); + initprintf(nedhandle ? "\nInitialized nedmalloc\n" : "\n"); #endif } diff --git a/polymer/eduke32/nedmalloc.dll b/polymer/eduke32/nedmalloc.dll index ceca0169b..4952fe2bf 100644 Binary files a/polymer/eduke32/nedmalloc.dll and b/polymer/eduke32/nedmalloc.dll differ diff --git a/polymer/eduke32/source/actors.c b/polymer/eduke32/source/actors.c index f10e516d8..6c34baba4 100644 --- a/polymer/eduke32/source/actors.c +++ b/polymer/eduke32/source/actors.c @@ -2913,7 +2913,7 @@ ACTOR_STATIC void G_MoveWeapons(void) if (s->picnum == COOLEXPLOSION1) { if ((j&49152) == 49152 && sprite[j&(MAXSPRITES-1)].picnum != APLAYER) - goto BOLT; + goto COOLEXPLOSION; s->xvel = 0; s->zvel = 0; } @@ -3085,6 +3085,7 @@ ACTOR_STATIC void G_MoveWeapons(void) } if (s->picnum == COOLEXPLOSION1) { +COOLEXPLOSION: s->shade++; if (s->shade >= 40) KILLIT(i); } diff --git a/polymer/eduke32/source/game.c b/polymer/eduke32/source/game.c index 4061db40b..4a21fd370 100644 --- a/polymer/eduke32/source/game.c +++ b/polymer/eduke32/source/game.c @@ -6365,6 +6365,7 @@ skip: break; case FIRE__STATIC: case FIRE2__STATIC: + t->cstat |= 128; case BURNING__STATIC: case BURNING2__STATIC: if (sprite[s->owner].picnum != TREE1 && sprite[s->owner].picnum != TREE2) @@ -9156,7 +9157,7 @@ static void G_Startup(void) } for (i=0; ipeer, CHAN_GAMESTATE, enet_packet_create(packbuf, 2, ENET_PACKET_FLAG_RELIABLE)); } - g_player[other].playerreadyflag++; + g_player[other].pingcnt++; return; case PACKET_MESSAGE: @@ -3197,7 +3197,7 @@ void Net_EnterMessage(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; @@ -3226,7 +3226,7 @@ void Net_WaitForServer(void) handleevents(); Net_GetPackets(); - if (g_player[0].playerreadyflag > server_ready) + if (g_player[0].pingcnt > server_ready) { P_SetGamePalette(g_player[myconnectindex].ps, BASEPAL, 11); return; diff --git a/polymer/eduke32/source/player.h b/polymer/eduke32/source/player.h index 8aa0107d9..91e87a501 100644 --- a/polymer/eduke32/source/player.h +++ b/polymer/eduke32/source/player.h @@ -213,7 +213,7 @@ typedef struct { int32_t pcolor, pteam; uint8_t frags[MAXPLAYERS], wchoice[MAX_WEAPONS]; - char vote, gotvote, playerreadyflag, playerquitflag; + char vote, gotvote, pingcnt, playerquitflag; char user_name[32]; } playerdata_t; #pragma pack(pop)