summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorcinap_lenrek <cinap_lenrek@localhost>2011-05-27 15:55:56 +0000
committercinap_lenrek <cinap_lenrek@localhost>2011-05-27 15:55:56 +0000
commit30da40c16a94d56875aa705dd2485fb2eacc9bb4 (patch)
tree79ce25aff8ac8caaddbba1d2e843698981f12a57 /sys
parent439ef2f8ee8ac618a3f9df81a8fbf44fe39f728d (diff)
games/doom: fix the french problem, remove debug prints
Diffstat (limited to 'sys')
-rw-r--r--sys/src/games/doom/hu_stuff.c4
-rw-r--r--sys/src/games/doom/i_sound.c20
-rw-r--r--sys/src/games/doom/wi_stuff.c2
3 files changed, 13 insertions, 13 deletions
diff --git a/sys/src/games/doom/hu_stuff.c b/sys/src/games/doom/hu_stuff.c
index efb139671..583fca054 100644
--- a/sys/src/games/doom/hu_stuff.c
+++ b/sys/src/games/doom/hu_stuff.c
@@ -396,7 +396,7 @@ void HU_Init(void)
int j;
char buffer[9];
- if (french)
+ if (language == french)
shiftxform = french_shiftxform;
else
shiftxform = english_shiftxform;
@@ -727,7 +727,7 @@ boolean HU_Responder(event_t *ev)
}
else
{
- if (french)
+ if (language == french)
c = ForeignTranslation(c);
if (shiftdown || (c >= 'a' && c <= 'z'))
c = shiftxform[c];
diff --git a/sys/src/games/doom/i_sound.c b/sys/src/games/doom/i_sound.c
index 576bf1c26..9c227a90b 100644
--- a/sys/src/games/doom/i_sound.c
+++ b/sys/src/games/doom/i_sound.c
@@ -450,7 +450,7 @@ int I_StartSound(int id, int vol, int sep, int pitch, int priority)
void I_StopSound(int handle)
{
USED(handle);
- printf("PORTME i_sound.c I_StopSound\n");
+// printf("PORTME i_sound.c I_StopSound\n");
}
int I_SoundIsPlaying(int handle)
@@ -471,53 +471,53 @@ void I_UpdateSoundParams(int handle, int vol, int sep, int pitch)
void I_InitMusic(void)
{
- printf("PORTME i_sound.c I_InitMusic\n");
+// printf("PORTME i_sound.c I_InitMusic\n");
}
void I_ShutdownMusic(void)
{
- printf("PORTME i_sound.c I_ShutdownMusic\n");
+// printf("PORTME i_sound.c I_ShutdownMusic\n");
}
void I_SetMusicVolume(int volume)
{
USED(volume);
- printf("PORTME i_sound.c I_SetMusicVolume\n");
+// printf("PORTME i_sound.c I_SetMusicVolume\n");
}
void I_PauseSong(int handle)
{
USED(handle);
- printf("PORTME i_sound.c I_PauseSong\n");
+// printf("PORTME i_sound.c I_PauseSong\n");
}
void I_ResumeSong(int handle)
{
USED(handle);
- printf("PORTME i_sound.c I_ResumeSong\n");
+// printf("PORTME i_sound.c I_ResumeSong\n");
}
int I_RegisterSong(void *data)
{
USED(data);
- printf("PORTME i_sound.c I_RegisterSong\n");
+// printf("PORTME i_sound.c I_RegisterSong\n");
return 0;
}
void I_PlaySong(int handle, int looping)
{
USED(handle, looping);
- printf("PORTME i_sound.c I_PlaySong\n");
+// printf("PORTME i_sound.c I_PlaySong\n");
}
void I_StopSong(int handle)
{
USED(handle);
- printf("PORTME i_sound.c I_StopSong\n");
+// printf("PORTME i_sound.c I_StopSong\n");
}
void I_UnRegisterSong(int handle)
{
USED(handle);
- printf("PORTME i_sound.c I_UnregisterSong\n");
+// printf("PORTME i_sound.c I_UnregisterSong\n");
}
diff --git a/sys/src/games/doom/wi_stuff.c b/sys/src/games/doom/wi_stuff.c
index 55ee8136c..1ec84cf48 100644
--- a/sys/src/games/doom/wi_stuff.c
+++ b/sys/src/games/doom/wi_stuff.c
@@ -1646,7 +1646,7 @@ void WI_loadData(void)
sp_secret = W_CacheLumpName("WISCRT2", PU_STATIC);
// Yuck.
- if (french)
+ if (language == french)
{
// "items"
if (netgame && !deathmatch)