zdoom
/
raze-gles
mirror of https://github.com/ZDoom/raze-gles.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

All string literals sent as normal messages to the player in-game written in ALL CAPS have been converted by hand to more proper capitalization. (Critical errors have been left as-is, and the editor did not need changes.) 

git-svn-id: https://svn.eduke32.com/eduke32@2540 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
hendricks266 2012-03-26 05:07:12 +00:00
parent 9d74cd700e
commit efb440ada0
8 changed files with 394 additions and 394 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
polymer/eduke32/source/demo.c
View File

@ -629,7 +629,7 @@ nextdemo:
Net_GetPackets();
if (g_player[myconnectindex].gotvote == 0 && voting != -1 && voting != myconnectindex)
gametext(160,60,"PRESS F1 TO ACCEPT, F2 TO DECLINE",0,2+8+16);
gametext(160,60,"Press F1 to Accept, F2 to Decline",0,2+8+16);
}
if ((g_player[myconnectindex].ps->gm&MODE_MENU) && (g_player[myconnectindex].ps->gm&MODE_EOL))

88
polymer/eduke32/source/game.c
View File

@ -1298,21 +1298,21 @@ static void G_DrawStatusBar(int32_t snum)
if (j > 0)
{
if (getrendermode() >= 3 && althud_shadows)
minitext(288-30-o+1,180-3+1,"ON",4,POLYMOSTTRANS+10+16+permbit+256 + ROTATESPRITE_MAX);
minitext(288-30-o,180-3,"ON",0,10+16+permbit+256 + ROTATESPRITE_MAX);
minitext(288-30-o+1,180-3+1,"On",4,POLYMOSTTRANS+10+16+permbit+256 + ROTATESPRITE_MAX);
minitext(288-30-o,180-3,"On",0,10+16+permbit+256 + ROTATESPRITE_MAX);
}
else if ((uint32_t)j != 0x80000000)
{
if (getrendermode() >= 3 && althud_shadows)
minitext(284-30-o+1,180-3+1,"OFF",4,POLYMOSTTRANS+10+16+permbit+256 + ROTATESPRITE_MAX);
minitext(284-30-o,180-3,"OFF",2,10+16+permbit+256 + ROTATESPRITE_MAX);
minitext(284-30-o+1,180-3+1,"Off",4,POLYMOSTTRANS+10+16+permbit+256 + ROTATESPRITE_MAX);
minitext(284-30-o,180-3,"Off",2,10+16+permbit+256 + ROTATESPRITE_MAX);
}
if (p->inven_icon >= 6)
{
if (getrendermode() >= 3 && althud_shadows)
minitext(284-35-o+1,180-3+1,"AUTO",4,POLYMOSTTRANS+10+16+permbit+256 + ROTATESPRITE_MAX);
minitext(284-35-o,180-3,"AUTO",2,10+16+permbit+256 + ROTATESPRITE_MAX);
minitext(284-35-o+1,180-3+1,"Auto",4,POLYMOSTTRANS+10+16+permbit+256 + ROTATESPRITE_MAX);
minitext(284-35-o,180-3,"Auto",2,10+16+permbit+256 + ROTATESPRITE_MAX);
}
}
return;
@ -1395,9 +1395,9 @@ static void G_DrawStatusBar(int32_t snum)
break;
}
G_DrawInvNum(284-30-o,200-6,(uint8_t)i,0,10+permbit+256);
if (j > 0) minitext(288-30-o,180,"ON",0,10+16+permbit+256 + ROTATESPRITE_MAX);
else if ((uint32_t)j != 0x80000000) minitext(284-30-o,180,"OFF",2,10+16+permbit+256 + ROTATESPRITE_MAX);
if (p->inven_icon >= 6) minitext(284-35-o,180,"AUTO",2,10+16+permbit+256 + ROTATESPRITE_MAX);
if (j > 0) minitext(288-30-o,180,"On",0,10+16+permbit+256 + ROTATESPRITE_MAX);
else if ((uint32_t)j != 0x80000000) minitext(284-30-o,180,"Off",2,10+16+permbit+256 + ROTATESPRITE_MAX);
if (p->inven_icon >= 6) minitext(284-35-o,180,"Auto",2,10+16+permbit+256 + ROTATESPRITE_MAX);
}
return;
}
@ -1653,7 +1653,7 @@ static void G_DrawStatusBar(int32_t snum)
}
rotatesprite_fs(sbarx(231-o),sbary(SBY+13),sbarsc(65536L),0,i,0,0,10+16+permbit);
minitext(292-30-o,SBY+24,"%",6,10+16+permbit + ROTATESPRITE_MAX);
if (p->inven_icon >= 6) minitext(284-35-o,SBY+14,"AUTO",2,10+16+permbit + ROTATESPRITE_MAX);
if (p->inven_icon >= 6) minitext(284-35-o,SBY+14,"Auto",2,10+16+permbit + ROTATESPRITE_MAX);
}
if (u&(2048+4096))
{
@ -1671,8 +1671,8 @@ static void G_DrawStatusBar(int32_t snum)
default:
j = 0x80000000;
}
if (j > 0) minitext(288-30-o,SBY+14,"ON",0,10+16+permbit + ROTATESPRITE_MAX);
else if ((uint32_t)j != 0x80000000) minitext(284-30-o,SBY+14,"OFF",2,10+16+permbit + ROTATESPRITE_MAX);
if (j > 0) minitext(288-30-o,SBY+14,"On",0,10+16+permbit + ROTATESPRITE_MAX);
else if ((uint32_t)j != 0x80000000) minitext(284-30-o,SBY+14,"Off",2,10+16+permbit + ROTATESPRITE_MAX);
}
if (u&8192)
{
@ -2592,14 +2592,14 @@ static void G_ShowScores(void)
if (playerswhenstarted > 1 && (GametypeFlags[ud.coop]&GAMETYPE_SCORESHEET))
{
gametext(160,SCORESHEETOFFSET+58+2,"MULTIPLAYER TOTALS",0,2+8+16);
gametext(160,SCORESHEETOFFSET+58+2,"Multiplayer Totals",0,2+8+16);
gametext(160,SCORESHEETOFFSET+58+10,MapInfo[(ud.volume_number*MAXLEVELS)+ud.last_level-1].name,0,2+8+16);
t = 0;
minitext(70,SCORESHEETOFFSET+80,"NAME",8,2+8+16+ROTATESPRITE_MAX);
minitext(170,SCORESHEETOFFSET+80,"FRAGS",8,2+8+16+ROTATESPRITE_MAX);
minitext(200,SCORESHEETOFFSET+80,"DEATHS",8,2+8+16+ROTATESPRITE_MAX);
minitext(235,SCORESHEETOFFSET+80,"PING",8,2+8+16+ROTATESPRITE_MAX);
minitext(70,SCORESHEETOFFSET+80,"Name",8,2+8+16+ROTATESPRITE_MAX);
minitext(170,SCORESHEETOFFSET+80,"Frags",8,2+8+16+ROTATESPRITE_MAX);
minitext(200,SCORESHEETOFFSET+80,"Deaths",8,2+8+16+ROTATESPRITE_MAX);
minitext(235,SCORESHEETOFFSET+80,"Ping",8,2+8+16+ROTATESPRITE_MAX);
for (i=playerswhenstarted-1; i>=0; i--)
{
@ -2923,7 +2923,7 @@ void G_DisplayRest(int32_t smoothratio)
#endif
if (ud.pause_on==1 && (g_player[myconnectindex].ps->gm&MODE_MENU) == 0)
menutext(160,100,0,0,"GAME PAUSED");
menutext(160,100,0,0,"Game Paused");
if (ud.coords)
G_PrintCoords(screenpeek);
@ -2995,11 +2995,11 @@ void G_DisplayRest(int32_t smoothratio)
if (g_player[myconnectindex].gotvote == 0 && voting != -1 && voting != myconnectindex)
{
Bsprintf(tempbuf,"%s^00 HAS CALLED A VOTE FOR MAP",g_player[voting].user_name);
Bsprintf(tempbuf,"%s^00 has called a vote for map",g_player[voting].user_name);
gametext(160,40,tempbuf,0,2+8+16);
Bsprintf(tempbuf,"%s (E%dL%d)",MapInfo[vote_episode*MAXLEVELS + vote_map].name,vote_episode+1,vote_map+1);
gametext(160,48,tempbuf,0,2+8+16);
gametext(160,70,"PRESS F1 TO ACCEPT, F2 TO DECLINE",0,2+8+16);
gametext(160,70,"Press F1 to Accept, F2 to Decline",0,2+8+16);
}
if (BUTTON(gamefunc_Show_DukeMatch_Scores)) G_ShowScores();
@ -7019,9 +7019,9 @@ FOUNDCHEAT:
g_player[myconnectindex].ps->cheat_phase = 0;
G_DumpDebugInfo();
Bsprintf(tempbuf,"GAMEVARS DUMPED TO LOG");
Bsprintf(tempbuf,"Gamevars dumped to log");
G_AddUserQuote(tempbuf);
Bsprintf(tempbuf,"MAP DUMPED TO DEBUG.MAP");
Bsprintf(tempbuf,"Map dumped to debug.map");
G_AddUserQuote(tempbuf);
break;
@ -7072,7 +7072,7 @@ FOUNDCHEAT:
}
else
{
Bstrcpy(ScriptQuotes[QUOTE_RESERVED4],"COME GET SOME!");
Bstrcpy(ScriptQuotes[QUOTE_RESERVED4],"Come Get Some!");
S_PlaySound(DUKE_GETWEAPON2);
P_DoQuote(QUOTE_RESERVED4, g_player[myconnectindex].ps);
@ -7294,14 +7294,14 @@ FOUNDCHEAT:
case CHEAT_MONSTERS:
{
char *s[] = { "ON", "OFF" };
char *s[] = { "On", "Off" };
if (++g_noEnemies == 3)
g_noEnemies = 0;
g_player[screenpeek].ps->cheat_phase = 0;
Bsprintf(ScriptQuotes[QUOTE_RESERVED4], "MONSTERS: %s", s[g_noEnemies & 1]);
Bsprintf(ScriptQuotes[QUOTE_RESERVED4], "Monsters: %s", s[g_noEnemies & 1]);
P_DoQuote(QUOTE_RESERVED4,g_player[myconnectindex].ps);
KB_FlushKeyBoardQueue();
@ -7384,7 +7384,7 @@ void G_HandleLocalKeys(void)
enet_host_broadcast(g_netServer, CHAN_GAMESTATE, enet_packet_create(tempbuf, 4, ENET_PACKET_FLAG_RELIABLE));
G_AddUserQuote("VOTE CAST");
G_AddUserQuote("Vote Cast");
g_player[myconnectindex].gotvote = 1;
KB_ClearKeyDown(sc_F1);
KB_ClearKeyDown(sc_F2);
@ -7614,9 +7614,9 @@ void G_HandleLocalKeys(void)
if (MapInfo[(uint8_t)g_musicIndex].musicfn != NULL)
{
if (S_PlayMusic(&MapInfo[(uint8_t)g_musicIndex].musicfn[0],g_musicIndex))
Bsprintf(ScriptQuotes[QUOTE_MUSIC],"PLAYING %s",&MapInfo[(uint8_t)g_musicIndex].alt_musicfn[0]);
Bsprintf(ScriptQuotes[QUOTE_MUSIC],"Playing %s",&MapInfo[(uint8_t)g_musicIndex].alt_musicfn[0]);
else
Bsprintf(ScriptQuotes[QUOTE_MUSIC],"PLAYING %s",&MapInfo[(uint8_t)g_musicIndex].musicfn[0]);
Bsprintf(ScriptQuotes[QUOTE_MUSIC],"Playing %s",&MapInfo[(uint8_t)g_musicIndex].musicfn[0]);
P_DoQuote(QUOTE_MUSIC,g_player[myconnectindex].ps);
}
return;
@ -7819,7 +7819,7 @@ FAKE_F3:
probey = g_lastSaveSlot; */
if (g_netServer || ud.multimode > 1)
{
Bstrcpy(ScriptQuotes[QUOTE_RESERVED4], "MULTIPLAYER SAVING NOT SUPPORTED YET");
Bstrcpy(ScriptQuotes[QUOTE_RESERVED4], "Multiplayer Saving Not Yet Supported");
P_DoQuote(QUOTE_RESERVED4, g_player[myconnectindex].ps);
//G_SavePlayer(-1-(g_lastSaveSlot));
}
@ -7852,7 +7852,7 @@ FAKE_F3:
else if (MapInfo[(uint8_t)g_musicIndex].musicfn != NULL)
{
Bstrcpy(ScriptQuotes[QUOTE_MUSIC],&MapInfo[(uint8_t)g_musicIndex].musicfn[0]);
Bstrcat(ScriptQuotes[QUOTE_MUSIC],". USE SHIFT-F5 TO CHANGE.");
Bstrcat(ScriptQuotes[QUOTE_MUSIC],". Use SHIFT-F5 to change.");
}
else ScriptQuotes[QUOTE_MUSIC][0] = '\0';
P_DoQuote(QUOTE_MUSIC, g_player[myconnectindex].ps);
@ -7886,7 +7886,7 @@ FAKE_F3:
if (g_netServer || ud.multimode > 1)
{
Bstrcpy(ScriptQuotes[QUOTE_RESERVED4], "MULTIPLAYER LOADING NOT SUPPORTED YET");
Bstrcpy(ScriptQuotes[QUOTE_RESERVED4], "Multiplayer Loading Not Yet Supported");
P_DoQuote(QUOTE_RESERVED4, g_player[myconnectindex].ps);
// G_LoadPlayer(-1-g_lastSaveSlot);
@ -11197,11 +11197,11 @@ void G_BonusScreen(int32_t bonusonly)
P_SetGamePalette(g_player[myconnectindex].ps, BASEPAL, 8+2/*+1*/); // JBF 20040308
G_FadePalette(0,0,0,63);
clearview(0L);
menutext(160,60,0,0,"THANKS TO ALL OUR");
menutext(160,60+16,0,0,"FANS FOR GIVING");
menutext(160,60+16+16,0,0,"US BIG HEADS.");
menutext(160,70+16+16+16,0,0,"LOOK FOR A DUKE NUKEM 3D");
menutext(160,70+16+16+16+16,0,0,"SEQUEL SOON.");
menutext(160,60,0,0,"Thanks to all our");
menutext(160,60+16,0,0,"fans for giving");
menutext(160,60+16+16,0,0,"us big heads.");
menutext(160,70+16+16+16,0,0,"Look for a Duke Nukem 3D");
menutext(160,70+16+16+16+16,0,0,"sequel soon.");
nextpage();
fadepal(0,0,0, 63,0,-3);
@ -11380,13 +11380,13 @@ FRAGBONUS:
rotatesprite_fs(160<<16,34<<16,65536L,0,INGAMEDUKETHREEDEE,0,0,10);
if (PLUTOPAK) // JBF 20030804
rotatesprite_fs((260)<<16,36<<16,65536L,0,PLUTOPAKSPRITE+2,0,0,2+8);
gametext(160,58+2,"MULTIPLAYER TOTALS",0,2+8+16);
gametext(160,58+2,"Multiplayer Totals",0,2+8+16);
gametext(160,58+10,MapInfo[(ud.volume_number*MAXLEVELS)+ud.last_level-1].name,0,2+8+16);
gametext(160,165,"PRESS ANY KEY OR BUTTON TO CONTINUE",quotepulseshade,2+8+16);
gametext(160,165,"Press any key or button to continue",quotepulseshade,2+8+16);
t = 0;
minitext(23,80," NAME KILLS",8,2+8+16+128);
minitext(23,80," Name Kills",8,2+8+16+128);
for (i=0; i<playerswhenstarted; i++)
{
Bsprintf(tempbuf,"%-4d",i+1);
@ -11436,7 +11436,7 @@ FRAGBONUS:
minitext(92+(y*23),96+(8*7),tempbuf,2,2+8+16+128);
}
minitext(45,96+(8*7),"DEATHS",8,2+8+16+128);
minitext(45,96+(8*7),"Deaths",8,2+8+16+128);
nextpage();
fadepal(0,0,0, 63,0,-7);
@ -11475,9 +11475,9 @@ FRAGBONUS:
if (lastmapname)
menutext(160,20-6,0,0,lastmapname);
menutext(160,36-6,0,0,"COMPLETED");
menutext(160,36-6,0,0,"Completed");
gametext(160,192,"PRESS ANY KEY OR BUTTON TO CONTINUE",quotepulseshade,2+8+16);
gametext(160,192,"Press any key or button to continue",quotepulseshade,2+8+16);
if (!(ud.config.MusicToggle == 0 || ud.config.MusicDevice < 0))
S_PlaySound(BONUSMUSIC);
@ -11578,9 +11578,9 @@ FRAGBONUS:
if (lastmapname)
menutext(160,20-6,0,0,lastmapname);
menutext(160,36-6,0,0,"COMPLETED");
menutext(160,36-6,0,0,"Completed");
gametext(160,192,"PRESS ANY KEY OR BUTTON TO CONTINUE",quotepulseshade,2+8+16);
gametext(160,192,"Press any key or button to continue",quotepulseshade,2+8+16);
if (totalclock > (60*3))
{

6
polymer/eduke32/source/global.c
View File

@ -60,10 +60,10 @@ map_t MapInfo[(MAXVOLUMES+1)*MAXLEVELS]; // +1 volume for "intro", "briefing" mu
sound_t g_sounds[ MAXSOUNDS ];
volatile char g_soundlocks[MAXSOUNDS];
char EpisodeNames[MAXVOLUMES][33] = { "L.A. MELTDOWN", "LUNAR APOCALYPSE", "SHRAPNEL CITY" };
char SkillNames[MAXSKILLS][33] = { "PIECE OF CAKE", "LET'S ROCK", "COME GET SOME", "DAMN I'M GOOD" };
char EpisodeNames[MAXVOLUMES][33] = { "L.A. Meltdown", "Lunar Apocalypse", "Shrapnel City" };
char SkillNames[MAXSKILLS][33] = { "Piece Of Cake", "Let's Rock", "Come Get Some", "Damn I'm Good" };
char GametypeNames[MAXGAMETYPES][33] = { "DUKEMATCH (SPAWN)","COOPERATIVE PLAY","DUKEMATCH (NO SPAWN)","TEAM DM (SPAWN)","TEAM DM (NO SPAWN)"};
char GametypeNames[MAXGAMETYPES][33] = { "DukeMatch (Spawn)","Cooperative Play","DukeMatch (No Spawn)","Team DM (Spawn)","Team DM (No Spawn)"};
int32_t GametypeFlags[MAXGAMETYPES] =
{

638
polymer/eduke32/source/menus.c
View File

File diff suppressed because it is too large Load Diff

40
polymer/eduke32/source/net.c
View File

@ -1661,7 +1661,7 @@ void Net_ParseServerPacket(ENetEvent *event)
input_t *nsyn;
#if 0
initprintf("RECEIVED PACKET: type: %d : len %d\n", pbuf[0], packbufleng);
initprintf("Received Packet: type: %d : len %d\n", pbuf[0], packbufleng);
#endif
switch (pbuf[0])
{
@ -1907,7 +1907,7 @@ void Net_ParseServerPacket(ENetEvent *event)
case PACKET_NEW_GAME:
if ((vote_map + vote_episode + voting) != -3)
G_AddUserQuote("VOTE SUCCEEDED");
G_AddUserQuote("Vote Succeeded");
ud.m_level_number = ud.level_number = pbuf[1];
ud.m_volume_number = ud.volume_number = pbuf[2];
@ -2075,7 +2075,7 @@ void Net_ParseServerPacket(ENetEvent *event)
{
g_player[(uint8_t)pbuf[1]].gotvote = 1;
g_player[(uint8_t)pbuf[1]].vote = pbuf[2];
Bsprintf(tempbuf,"CONFIRMED VOTE FROM %s",g_player[(uint8_t)pbuf[1]].user_name);
Bsprintf(tempbuf,"Confirmed vote from %s",g_player[(uint8_t)pbuf[1]].user_name);
G_AddUserQuote(tempbuf);
}
break;
@ -2085,13 +2085,13 @@ void Net_ParseServerPacket(ENetEvent *event)
vote_episode = pbuf[2];
vote_map = pbuf[3];
Bsprintf(tempbuf,"%s^00 HAS CALLED A VOTE TO CHANGE MAP TO %s (E%dL%d)",
Bsprintf(tempbuf,"%s^00 has called a vote to change map to %s (E%dL%d)",
g_player[(uint8_t)pbuf[1]].user_name,
MapInfo[(uint8_t)(pbuf[2]*MAXLEVELS + pbuf[3])].name,
pbuf[2]+1,pbuf[3]+1);
G_AddUserQuote(tempbuf);
Bsprintf(tempbuf,"PRESS F1 TO ACCEPT, F2 TO DECLINE");
Bsprintf(tempbuf,"Press F1 to Accept, F2 to Decline");
G_AddUserQuote(tempbuf);
for (i=MAXPLAYERS-1; i>=0; i--)
@ -2111,8 +2111,8 @@ void Net_ParseServerPacket(ENetEvent *event)
i += g_player[j].gotvote;
if (i != numplayers)
Bsprintf(tempbuf,"%s^00 HAS CANCELED THE VOTE",g_player[(uint8_t)pbuf[1]].user_name);
else Bsprintf(tempbuf,"VOTE FAILED");
Bsprintf(tempbuf,"%s^00 has canceled the vote",g_player[(uint8_t)pbuf[1]].user_name);
else Bsprintf(tempbuf,"Vote Failed");
for (i=MAXPLAYERS-1; i>=0; i--)
{
g_player[i].vote = 0;
@ -2133,7 +2133,7 @@ void Net_ParseClientPacket(ENetEvent *event)
input_t *nsyn;
#if 0
initprintf("RECEIVED PACKET: type: %d : len %d\n", pbuf[0], packbufleng);
initprintf("Received Packet: type: %d : len %d\n", pbuf[0], packbufleng);
#endif
switch (pbuf[0])
{
@ -2255,7 +2255,7 @@ void Net_ParseClientPacket(ENetEvent *event)
case PACKET_NEW_GAME:
if ((vote_map + vote_episode + voting) != -3)
G_AddUserQuote("VOTE SUCCEEDED");
G_AddUserQuote("Vote Succeeded");
ud.m_level_number = ud.level_number = pbuf[1];
ud.m_volume_number = ud.volume_number = pbuf[2];
@ -2343,7 +2343,7 @@ void Net_ParseClientPacket(ENetEvent *event)
{
g_player[(uint8_t)pbuf[1]].gotvote = 1;
g_player[(uint8_t)pbuf[1]].vote = pbuf[2];
Bsprintf(tempbuf,"CONFIRMED VOTE FROM %s",g_player[(uint8_t)pbuf[1]].user_name);
Bsprintf(tempbuf,"Confirmed vote from %s",g_player[(uint8_t)pbuf[1]].user_name);
G_AddUserQuote(tempbuf);
}
break;
@ -2353,13 +2353,13 @@ void Net_ParseClientPacket(ENetEvent *event)
vote_episode = pbuf[2];
vote_map = pbuf[3];
Bsprintf(tempbuf,"%s^00 HAS CALLED A VOTE TO CHANGE MAP TO %s (E%dL%d)",
Bsprintf(tempbuf,"%s^00 has called a vote to change map to %s (E%dL%d)",
g_player[(uint8_t)pbuf[1]].user_name,
MapInfo[(uint8_t)(pbuf[2]*MAXLEVELS + pbuf[3])].name,
pbuf[2]+1,pbuf[3]+1);
G_AddUserQuote(tempbuf);
Bsprintf(tempbuf,"PRESS F1 TO ACCEPT, F2 TO DECLINE");
Bsprintf(tempbuf,"Press F1 to Accept, F2 to Decline");
G_AddUserQuote(tempbuf);
for (i=MAXPLAYERS-1; i>=0; i--)
@ -2379,8 +2379,8 @@ void Net_ParseClientPacket(ENetEvent *event)
i += g_player[j].gotvote;
if (i != numplayers)
Bsprintf(tempbuf,"%s^00 HAS CANCELED THE VOTE",g_player[(uint8_t)pbuf[1]].user_name);
else Bsprintf(tempbuf,"VOTE FAILED");
Bsprintf(tempbuf,"%s^00 has canceled the vote",g_player[(uint8_t)pbuf[1]].user_name);
else Bsprintf(tempbuf,"Vote Failed");
for (i=MAXPLAYERS-1; i>=0; i--)
{
g_player[i].vote = 0;
@ -2554,7 +2554,7 @@ void Net_GetPackets(void)
Bmemcpy((uint8_t *)(buf)+datasiz, event.packet->data, event.packet->dataLength);
datasiz += SYNCPACKETSIZE;
Bsprintf(tbuf, "RECEIVED %d BYTES\n", (int32_t)datasiz);
Bsprintf(tbuf, "Received %d bytes\n", (int32_t)datasiz);
gametext(160,190,tbuf,14,2);
}
// last packet of mapstate sequence
@ -2574,7 +2574,7 @@ void Net_GetPackets(void)
packbuf[1] = myconnectindex;
enet_peer_send(g_netClientPeer, CHAN_GAMESTATE, enet_packet_create(&packbuf[0], 2, ENET_PACKET_FLAG_RELIABLE));
gametext(160,190,"TRANSFER COMPLETE",14,2);
gametext(160,190,"Transfer Complete",14,2);
}
else
{
@ -2584,7 +2584,7 @@ void Net_GetPackets(void)
g_netDisconnect = 1;
g_netSync = 0;
gametext(160,190,"TRANSFER ERROR",14,2);
gametext(160,190,"Transfer Error",14,2);
}
}
else
@ -2593,7 +2593,7 @@ void Net_GetPackets(void)
g_netDisconnect = 1;
g_netSync = 0;
gametext(160,190,"TRANSFER ERROR",14,2);
gametext(160,190,"Transfer Error",14,2);
}
nextpage();
@ -3046,7 +3046,7 @@ void Net_EnterMessage(void)
else if (g_chatPlayer == -1)
{
j = 50;
gametext(320>>1,j,"SEND MESSAGE TO...",0,2+8+16);
gametext(320>>1,j,"Send message to...",0,2+8+16);
j += 8;
for (TRAVERSE_CONNECT(i))
{
@ -3154,7 +3154,7 @@ void Net_WaitForServer(void)
if (PLUTOPAK) // JBF 20030804
rotatesprite_fs(160<<16,(151)<<16,30<<11,0,PLUTOPAKSPRITE+1,0,0,2+8);
gametext(160,170,"WAITING FOR SERVER",14,2);
gametext(160,170,"Waiting for server",14,2);
nextpage();
packbuf[0] = PACKET_PLAYER_PING;

4
polymer/eduke32/source/player.c
View File

@ -3816,12 +3816,12 @@ void P_FragPlayer(int32_t snum)
if (snum == screenpeek)
{
Bsprintf(ScriptQuotes[QUOTE_RESERVED],"KILLED BY %s",&g_player[p->frag_ps].user_name[0]);
Bsprintf(ScriptQuotes[QUOTE_RESERVED],"Killed by %s",&g_player[p->frag_ps].user_name[0]);
P_DoQuote(QUOTE_RESERVED,p);
}
else
{
Bsprintf(ScriptQuotes[QUOTE_RESERVED2],"KILLED %s",&g_player[snum].user_name[0]);
Bsprintf(ScriptQuotes[QUOTE_RESERVED2],"Killed %s",&g_player[snum].user_name[0]);
P_DoQuote(QUOTE_RESERVED2,g_player[p->frag_ps].ps);
}

8
polymer/eduke32/source/premap.c
View File

@ -374,12 +374,12 @@ static void G_DoLoadScreen(char *statustext, int32_t percent)
if (boardfilename[0] != 0 && ud.level_number == 7 && ud.volume_number == 0)
{
menutext(160,90,0,0,"LOADING USER MAP");
menutext(160,90,0,0,"Loading User Map");
gametextpal(160,90+10,boardfilename,14,2);
}
else
{
menutext(160,90,0,0,"LOADING");
menutext(160,90,0,0,"Loading");
if (MapInfo[(ud.volume_number*MAXLEVELS) + ud.level_number].name != NULL)
menutext(160,90+16+8,0,0,MapInfo[(ud.volume_number*MAXLEVELS) + ud.level_number].name);
}
@ -430,7 +430,7 @@ static void G_DoLoadScreen(char *statustext, int32_t percent)
return;
}
menutext(160,105,0,0,"LOADING...");
menutext(160,105,0,0,"Loading...");
if (statustext) gametext(160,180,statustext,0,2+8+16);
VM_OnEvent(EVENT_DISPLAYLOADINGSCREEN, g_player[screenpeek].ps->i, screenpeek, -1);
nextpage();
@ -1947,7 +1947,7 @@ int32_t G_EnterLevel(int32_t g)
if (MapInfo[(ud.volume_number*MAXLEVELS)+ud.level_number].name == NULL)
{
MapInfo[(ud.volume_number*MAXLEVELS)+ud.level_number].name = Bcalloc(16,sizeof(uint8_t));
Bsprintf(MapInfo[(ud.volume_number*MAXLEVELS)+ud.level_number].name,"USER MAP");
Bsprintf(MapInfo[(ud.volume_number*MAXLEVELS)+ud.level_number].name,"User Map");
}
}
else

2
polymer/eduke32/source/savegame.c
View File

@ -349,7 +349,7 @@ int32_t G_SavePlayer(int32_t spot)
if (!g_netServer && ud.multimode < 2)
{
Bstrcpy(ScriptQuotes[QUOTE_RESERVED4], "GAME SAVED");
Bstrcpy(ScriptQuotes[QUOTE_RESERVED4], "Game Saved");
P_DoQuote(QUOTE_RESERVED4, g_player[myconnectindex].ps);
}