diff options
| author | Andrey Nazarov <skuller@skuller.net> | 2007-11-25 20:57:50 +0000 |
|---|---|---|
| committer | Andrey Nazarov <skuller@skuller.net> | 2007-11-25 20:57:50 +0000 |
| commit | b00e7bd024285970dd00cfc75d8e690bfa475501 (patch) | |
| tree | 22ceeee3027fd4872f5621650557bc8ae4391948 /source/sw_main.c | |
| parent | 5eaaac93ad3b0d2777815717059d977912bd96f7 (diff) | |
Changed Com_sprintf --> Q_concat in quite some cases.
Make sure WAVE sound driver is built by default.
Added --disable-wave option to `configure'.
Command line history is now remembered between sessions.
ALT+Space refreshes all servers in Server Browser.
Handle command line agruments like original Q2 engine did.
Diffstat (limited to 'source/sw_main.c')
| -rw-r--r-- | source/sw_main.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/sw_main.c b/source/sw_main.c index 5c27d1d..501134d 100644 --- a/source/sw_main.c +++ b/source/sw_main.c @@ -1227,8 +1227,8 @@ extern mtexinfo_t r_skytexinfo[6]; void R_SetSky( const char *name, float rotate, vec3_t axis ) { // 3dstudio environment map names - static char *suf[6] = {"rt", "bk", "lf", "ft", "up", "dn"}; - static int r_skysideimage[6] = {5, 2, 4, 1, 0, 3}; + static const char suf[6][3] = {"rt", "bk", "lf", "ft", "up", "dn"}; + static const int r_skysideimage[6] = {5, 2, 4, 1, 0, 3}; int i; char pathname[MAX_QPATH]; @@ -1238,8 +1238,8 @@ void R_SetSky( const char *name, float rotate, vec3_t axis ) { for (i=0 ; i<6 ; i++) { - Com_sprintf (pathname, sizeof(pathname), "env/%s%s.pcx", skyname, - suf[r_skysideimage[i]]); + Q_concat( pathname, sizeof( pathname ), + "env/", skyname, suf[r_skysideimage[i]], ".pcx", NULL ); r_skytexinfo[i].image = R_FindImage (pathname, it_sky); } } |