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

Fixes

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@135 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx 2006-05-01 22:49:09 +00:00
parent b82b776b9e
commit 34241c8514
6 changed files with 25 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
polymer/eduke32/Makefile
View file

@ -157,7 +157,11 @@ alldarwin:
cd osx && xcodebuild -target All -buildstyle $(style)
endif
ifeq ($(PLATFORM),WINDOWS)
all: eduke32$(EXESUFFIX) mapster32$(EXESUFFIX) duke3d_w32$(EXESUFFIX)
else
all: eduke32$(EXESUFFIX) mapster32$(EXESUFFIX)
endif
eduke32$(EXESUFFIX): $(GAMEOBJS) $(EOBJ)$(ENGINELIB)
$(CC) -o $@ $^ $(JFAUDLIBS) $(LIBS) $(STDCPPLIB) -Wl,-Map=$@.map

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

@ -567,6 +567,9 @@ void CONFIG_ReadSetup( void )
SCRIPT_GetString( scripthandle, "Comm Setup","PlayerName",&myname[0]);
if(Bstrlen(myname) > 9)
myname[10] = 0;
SCRIPT_GetString( scripthandle, "Comm Setup","RTSName",&ud.rtsname[0]);
SCRIPT_GetNumber( scripthandle, "Screen Setup", "Shadows",&ud.shadows);

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

@ -8261,7 +8261,13 @@ void Startup(void)
if (CommandSoundToggleOff) SoundToggle = 0;
if (CommandMusicToggleOff) MusicToggle = 0;
if (CommandName) strcpy(myname,CommandName);
if (CommandName)
{
Bstrncpy(myname, CommandName, 10);
myname[10] = 0;
}
if (CommandMap) {
if (VOLUMEONE) {
initprintf("The -map option is available in the registered version only!\n");

10
polymer/eduke32/source/menus.c
View file

@ -701,7 +701,7 @@ void menus(void)
break;
}
} else {
x = strget(200,50-9,buf,12,0);
x = strget(200,50-9,buf,10,0);
if (x) {
if (x == 1) {
if(buf[0]) {
@ -3476,9 +3476,7 @@ cheat_for_port_credits:
}
break;
case 1:
if(numplayers < 2)
if(MusicDevice >= 0)
if(MusicDevice >= 0 && (numplayers < 2 || MusicToggle))
{
MusicToggle = 1-MusicToggle;
if( MusicToggle == 0 ) MUSIC_Pause();
@ -3517,7 +3515,7 @@ cheat_for_port_credits:
menutext(c+160+40,50,MENUHIGHLIGHT(0),(FXDevice<0),SoundToggle && FXDevice >= 0?"ON":"OFF");
menutext(c+160+40,50+16,MENUHIGHLIGHT(1),(MusicDevice < 0),MusicToggle && (MusicDevice >= 0) && (numplayers<2)?"ON":"OFF");
menutext(c+160+40,50+16,MENUHIGHLIGHT(1),(MusicDevice<0||(numplayers > 1 && !MusicToggle)),(MusicToggle && (MusicDevice >= 0))?"ON":"OFF");
menutext(c,50,MENUHIGHLIGHT(0),(FXDevice<0),"SOUND");
menutext(c,50+16+16,MENUHIGHLIGHT(2),(FXDevice<0)||SoundToggle==0,"SOUND VOLUME");
@ -3530,7 +3528,7 @@ cheat_for_port_credits:
if(l != FXVolume)
FX_SetVolume( (short) FXVolume );
}
menutext(c,50+16,MENUHIGHLIGHT(1),(MusicDevice<0),"MUSIC");
menutext(c,50+16,MENUHIGHLIGHT(1),(MusicDevice<0||(numplayers > 1 && !MusicToggle)),"MUSIC");
menutext(c,50+16+16+16,MENUHIGHLIGHT(3),(MusicDevice<0)||MusicToggle==0,"MUSIC VOLUME");
{
l = MusicVolume;

2
polymer/eduke32/source/osdcmds.c
View file

@ -442,7 +442,7 @@ struct cvarmappings {
{ "cl_weaponswitch", "cl_weaponswitch: enable/disable auto weapon switching", (void*)&ud.weaponswitch, CVAR_INT|256, 0, 0, 3 },
{ "cl_autoaim", "cl_autoaim: enable/disable weapon autoaim", (void*)&AutoAim, CVAR_INT|256, 0, 0, 2 },
{ "cl_messagetime", "cl_messagetime: length of time to display multiplayer chat messages\n", (void*)&ud.msgdisptime, CVAR_INT, 0, 0, 3600 },
{ "name", "name: change your multiplayer nickname", (void*)&myname[0], CVAR_STRING|256, sizeof(myname), 0, 0 }
{ "name", "name: change your multiplayer nickname", (void*)&myname[0], CVAR_STRING|256, 11, 0, 0 }
};
int osdcmd_cvar_set(const osdfuncparm_t *parm)

13
polymer/eduke32/source/wrapper.c
View file

@ -9,7 +9,7 @@
int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInst, LPSTR lpCmdLine, int nCmdShow)
{
int i,j;
int i=0,j=0;
char CmdLine[1024], sCmdLine[1024], szFileName[255];
LPTSTR szCmdLine;
@ -19,14 +19,13 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInst, LPSTR lpCmdLine, in
strcpy(sCmdLine,lpCmdLine);
i = 0;
while(sCmdLine[i] == ' ') i++;
while(i < (signed)strlen(sCmdLine))
{
if(sCmdLine[i] == '-' && sCmdLine[i+1] == 'n' && sCmdLine[i+2] == 'e' && sCmdLine[i+3] == 't')
{
CmdLine[i-1] = '\0';
j = 0,i += 5;
i += 5;
while(sCmdLine[i] != ' ' && i < (signed)strlen(sCmdLine))
{
szFileName[j] = sCmdLine[i];
@ -39,9 +38,9 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInst, LPSTR lpCmdLine, in
i++;
}
if(szFileName[0])
sprintf(sCmdLine,"eduke32.exe %s -rmnet %s",CmdLine,szFileName);
else sprintf(sCmdLine,"eduke32.exe %s",CmdLine);
if(szFileName[0] && CmdLine[0]) sprintf(sCmdLine,"eduke32.exe %s -rmnet %s",CmdLine,szFileName);
else if(CmdLine[0]) sprintf(sCmdLine,"eduke32.exe %s",CmdLine);
else sprintf(sCmdLine,"eduke32.exe");
szCmdLine = sCmdLine;