summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Makefile8
-rw-r--r--src/botlib/be_interface.c4
-rw-r--r--src/client/cl_cin.c4
-rw-r--r--src/qcommon/q_shared.h7
-rw-r--r--src/renderer/tr_main.c8
-rw-r--r--src/renderer/tr_model.c32
-rw-r--r--src/renderer/tr_shade_calc.c2
-rw-r--r--src/server/sv_main.c2
-rw-r--r--src/tools/lcc/cpp/unix.c4
-rw-r--r--src/unix/linux_glimp.c66
-rw-r--r--src/unix/sdl_glimp.c14
-rw-r--r--src/unix/unix_net.c53
-rw-r--r--src/win32/win_glimp.c8
-rw-r--r--src/win32/win_syscon.c2
14 files changed, 131 insertions, 83 deletions
diff --git a/Makefile b/Makefile
index 989461c5..deb40a0c 100644
--- a/Makefile
+++ b/Makefile
@@ -12,7 +12,7 @@
# GNU Make required
#
-COMPILE_PLATFORM=$(shell uname|sed -e s/_.*//|tr A-Z a-z)
+COMPILE_PLATFORM=$(shell uname|sed -e s/_.*//|tr '[:upper:]' '[:lower:]')
ifeq ($(COMPILE_PLATFORM),darwin)
# Apple does some things a little differently...
@@ -542,7 +542,7 @@ else # ifeq IRIX
# SETUP AND BUILD -- SunOS
#############################################################################
-ifeq ($(PLATFORM),SunOS)
+ifeq ($(PLATFORM),sunos)
CC=gcc
INSTALL=ginstall
@@ -612,7 +612,7 @@ ifeq ($(PLATFORM),SunOS)
LDFLAGS+=-m32
endif
-else # ifeq SunOS
+else # ifeq sunos
#############################################################################
# SETUP AND BUILD -- GENERIC
@@ -1487,7 +1487,7 @@ $(B)/base/qcommon/%.asm: $(CMDIR)/%.c
# MISC
#############################################################################
-clean:clean-debug clean-release
+clean: clean-debug clean-release
$(MAKE) -C $(MASTERDIR) clean
clean2:
diff --git a/src/botlib/be_interface.c b/src/botlib/be_interface.c
index fe5cbe8d..e70a6d4a 100644
--- a/src/botlib/be_interface.c
+++ b/src/botlib/be_interface.c
@@ -137,12 +137,14 @@ qboolean BotLibSetup(char *str)
int Export_BotLibSetup(void)
{
int errnum;
+ char logfilename[MAX_QPATH];
bot_developer = LibVarGetValue("bot_developer");
memset( &botlibglobals, 0, sizeof(botlibglobals) ); // bk001207 - init
//initialize byte swapping (litte endian etc.)
// Swap_Init();
- Log_Open("botlib.log");
+ Com_sprintf(logfilename, sizeof(logfilename), "%s%cbotlib.log", LibVarGetString("homedir"), PATH_SEP);
+ Log_Open(logfilename);
//
botimport.Print(PRT_MESSAGE, "------- BotLib Initialization -------\n");
//
diff --git a/src/client/cl_cin.c b/src/client/cl_cin.c
index f8cac9d2..f97d7712 100644
--- a/src/client/cl_cin.c
+++ b/src/client/cl_cin.c
@@ -1001,10 +1001,6 @@ static void readQuadInfo( byte *qData )
Com_Printf("HACK: approxmimating cinematic for Rage Pro or Voodoo\n");
}
}
-#if defined(MACOS_X)
- cinTable[currentHandle].drawX = 256;
- cinTable[currentHandle].drawX = 256;
-#endif
}
/******************************************************************************
diff --git a/src/qcommon/q_shared.h b/src/qcommon/q_shared.h
index 64019b58..6d276630 100644
--- a/src/qcommon/q_shared.h
+++ b/src/qcommon/q_shared.h
@@ -27,7 +27,12 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
// q_shared.h -- included first by ALL program modules.
// A user mod should never modify this file
-#define Q3_VERSION "tremulous 1.1.0"
+#define VERSION_NUMBER "1.1.0"
+#define Q3_VERSION "tremulous " VERSION_NUMBER
+#define CLIENT_WINDOW_TITLE "Tremulous " VERSION_NUMBER
+#define CLIENT_WINDOW_ICON "Tremulous"
+#define CONSOLE_WINDOW_TITLE "Tremulous " VERSION_NUMBER " console"
+#define CONSOLE_WINDOW_ICON "Tremulous console"
#define MAX_TEAMNAME 32
diff --git a/src/renderer/tr_main.c b/src/renderer/tr_main.c
index 56f3cbef..bbe94236 100644
--- a/src/renderer/tr_main.c
+++ b/src/renderer/tr_main.c
@@ -1038,11 +1038,17 @@ Radix sort with 4 byte size buckets
static void R_RadixSort( drawSurf_t *source, int size )
{
static drawSurf_t scratch[ MAX_DRAWSURFS ];
-
+#ifdef Q3_LITTLE_ENDIAN
R_Radix( 0, size, source, scratch );
R_Radix( 1, size, scratch, source );
R_Radix( 2, size, source, scratch );
R_Radix( 3, size, scratch, source );
+#else
+ R_Radix( 3, size, source, scratch );
+ R_Radix( 2, size, scratch, source );
+ R_Radix( 1, size, source, scratch );
+ R_Radix( 0, size, scratch, source );
+#endif //Q3_LITTLE_ENDIAN
}
//==========================================================================================
diff --git a/src/renderer/tr_model.c b/src/renderer/tr_model.c
index 9d6732e0..b59ff3b4 100644
--- a/src/renderer/tr_model.c
+++ b/src/renderer/tr_model.c
@@ -661,19 +661,20 @@ static qboolean R_LoadMDR( model_t *mod, void *buffer, int filesize, const char
curtri++;
}
- // tri and curtri now point to the end of their surfaces.
+ // tri now points to the end of the surface.
surf->ofsEnd = (byte *) tri - (byte *) surf;
-
- // find the next surface
surf = (mdrSurface_t *) tri;
- cursurf = (mdrSurface_t *) curtri;
+
+ // find the next surface.
+ cursurf = (mdrSurface_t *) ((byte *) cursurf + LittleLong(cursurf->ofsEnd));
}
// surf points to the next lod now.
lod->ofsEnd = (int)((byte *) surf - (byte *) lod);
-
lod = (mdrLOD_t *) surf;
- curlod = (mdrLOD_t *) cursurf;
+
+ // find the next LOD.
+ curlod = (mdrLOD_t *)((byte *) curlod + LittleLong(curlod->ofsEnd));
}
// lod points to the first tag now, so update the offset too.
@@ -959,7 +960,7 @@ static md3Tag_t *R_GetTag( md3Header_t *mod, int frame, const char *tagName ) {
#ifdef RAVENMD4
void R_GetAnimTag( mdrHeader_t *mod, int framenum, const char *tagName, md3Tag_t * dest)
{
- int i;
+ int i, j, k;
int frameSize;
mdrFrame_t *frame;
mdrTag_t *tag;
@@ -981,20 +982,13 @@ void R_GetAnimTag( mdrHeader_t *mod, int framenum, const char *tagName, md3Tag_t
//
frameSize = (long)( &((mdrFrame_t *)0)->bones[ mod->numBones ] );
frame = (mdrFrame_t *)((byte *)mod + mod->ofsFrames + framenum * frameSize );
- #if 1
- VectorCopy(&frame->bones[tag->boneIndex].matrix[0][0], dest->axis[0] );
- VectorCopy(&frame->bones[tag->boneIndex].matrix[1][0], dest->axis[1] );
- VectorCopy(&frame->bones[tag->boneIndex].matrix[2][0], dest->axis[2] );
- #else
+
+ for (j = 0; j < 3; j++)
{
- int j,k;
- for (j=0;j<3;j++)
- {
- for (k=0;k<3;k++)
- dest->axis[j][k]=frame->bones[tag->boneIndex].matrix[k][j];
- }
+ for (k = 0; k < 3; k++)
+ dest->axis[j][k]=frame->bones[tag->boneIndex].matrix[k][j];
}
- #endif
+
dest->origin[0]=frame->bones[tag->boneIndex].matrix[0][3];
dest->origin[1]=frame->bones[tag->boneIndex].matrix[1][3];
dest->origin[2]=frame->bones[tag->boneIndex].matrix[2][3];
diff --git a/src/renderer/tr_shade_calc.c b/src/renderer/tr_shade_calc.c
index df509cec..ee2f6ecb 100644
--- a/src/renderer/tr_shade_calc.c
+++ b/src/renderer/tr_shade_calc.c
@@ -620,7 +620,7 @@ void RB_CalcColorFromOneMinusEntity( unsigned char *dstColors )
{
int i;
int *pColors = ( int * ) dstColors;
- unsigned char invModulate[3];
+ unsigned char invModulate[4];
int c;
if ( !backEnd.currentEntity )
diff --git a/src/server/sv_main.c b/src/server/sv_main.c
index f525f5c5..b40d173f 100644
--- a/src/server/sv_main.c
+++ b/src/server/sv_main.c
@@ -256,7 +256,7 @@ void SV_MasterHeartbeat( void ) {
sv_master[i]->modified = qfalse;
continue;
}
- if ( !strstr( ":", sv_master[i]->string ) ) {
+ if ( !strchr( sv_master[i]->string, ':' ) ) {
adr[i].port = BigShort( PORT_MASTER );
}
Com_Printf( "%s resolved to %i.%i.%i.%i:%i\n", sv_master[i]->string,
diff --git a/src/tools/lcc/cpp/unix.c b/src/tools/lcc/cpp/unix.c
index b7850df8..397b1b4c 100644
--- a/src/tools/lcc/cpp/unix.c
+++ b/src/tools/lcc/cpp/unix.c
@@ -19,7 +19,7 @@ setup(int argc, char **argv)
char *fp, *dp;
Tokenrow tr;
extern void setup_kwtab(void);
- char *includeDirs[ NINCLUDE ] = { 0 };
+ uchar *includeDirs[ NINCLUDE ] = { 0 };
int numIncludeDirs = 0;
setup_kwtab();
@@ -77,7 +77,7 @@ setup(int argc, char **argv)
includelist[NINCLUDE-1].file = dp;
for( i = 0; i < numIncludeDirs; i++ )
- appendDirToIncludeList( includeDirs[ i ] );
+ appendDirToIncludeList( (char *)includeDirs[ i ] );
setsource(fp, fd, NULL);
}
diff --git a/src/unix/linux_glimp.c b/src/unix/linux_glimp.c
index f2899981..e6a86997 100644
--- a/src/unix/linux_glimp.c
+++ b/src/unix/linux_glimp.c
@@ -82,8 +82,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#define HAVE_XF86DGA
#endif
-#define WINDOW_CLASS_NAME "Tremulous"
-
typedef enum
{
RSERR_OK,
@@ -120,6 +118,7 @@ static int mouseResetTime = 0;
static cvar_t *in_mouse;
static cvar_t *in_dgamouse; // user pref for dga mouse
+static cvar_t *in_shiftedKeys; // obey modifiers for certain keys in non-console (comma, numbers, etc)
cvar_t *in_subframe;
cvar_t *in_nograb; // this is strictly for developers
@@ -202,6 +201,7 @@ static const char *Q_stristr( const char *s, const char *find)
static char *XLateKey(XKeyEvent *ev, int *key)
{
static char buf[64];
+ static char bufnomod[2];
KeySym keysym;
int XLookupRet;
@@ -211,14 +211,23 @@ static char *XLateKey(XKeyEvent *ev, int *key)
#ifdef KBD_DBG
ri.Printf(PRINT_ALL, "XLookupString ret: %d buf: %s keysym: %x\n", XLookupRet, buf, keysym);
#endif
-
+
+ if (!in_shiftedKeys->integer) {
+ // also get a buffer without modifiers held
+ ev->state = 0;
+ XLookupRet = XLookupString(ev, bufnomod, sizeof bufnomod, &keysym, 0);
+#ifdef KBD_DBG
+ ri.Printf(PRINT_ALL, "XLookupString (minus modifiers) ret: %d buf: %s keysym: %x\n", XLookupRet, buf, keysym);
+#endif
+ }
+
switch (keysym)
{
- case XK_KP_Page_Up:
+ case XK_KP_Page_Up:
case XK_KP_9: *key = K_KP_PGUP; break;
case XK_Page_Up: *key = K_PGUP; break;
- case XK_KP_Page_Down:
+ case XK_KP_Page_Down:
case XK_KP_3: *key = K_KP_PGDN; break;
case XK_Page_Down: *key = K_PGDN; break;
@@ -242,7 +251,7 @@ static char *XLateKey(XKeyEvent *ev, int *key)
case XK_KP_2: *key = K_KP_DOWNARROW; break;
case XK_Down: *key = K_DOWNARROW; break;
- case XK_KP_Up:
+ case XK_KP_Up:
case XK_KP_8: *key = K_KP_UPARROW; break;
case XK_Up: *key = K_UPARROW; break;
@@ -277,7 +286,7 @@ static char *XLateKey(XKeyEvent *ev, int *key)
case XK_F12: *key = K_F12; break;
- // bk001206 - from Ryan's Fakk2
+ // bk001206 - from Ryan's Fakk2
//case XK_BackSpace: *key = 8; break; // ctrl-h
case XK_BackSpace: *key = K_BACKSPACE; break; // ctrl-h
@@ -290,13 +299,13 @@ static char *XLateKey(XKeyEvent *ev, int *key)
case XK_Shift_L:
case XK_Shift_R: *key = K_SHIFT; break;
- case XK_Execute:
- case XK_Control_L:
+ case XK_Execute:
+ case XK_Control_L:
case XK_Control_R: *key = K_CTRL; break;
- case XK_Alt_L:
- case XK_Meta_L:
- case XK_Alt_R:
+ case XK_Alt_L:
+ case XK_Meta_L:
+ case XK_Alt_R:
case XK_Meta_R: *key = K_ALT; break;
case XK_KP_Begin: *key = K_KP_5; break;
@@ -321,16 +330,16 @@ static char *XLateKey(XKeyEvent *ev, int *key)
case XK_asterisk: *key = '8'; break;
case XK_parenleft: *key = '9'; break;
case XK_parenright: *key = '0'; break;
-
+
// weird french keyboards ..
// NOTE: console toggle is hardcoded in cl_keys.c, can't be unbound
// cleaner would be .. using hardware key codes instead of the key syms
// could also add a new K_KP_CONSOLE
case XK_twosuperior: *key = '~'; break;
-
- // https://zerowing.idsoftware.com/bugzilla/show_bug.cgi?id=472
- case XK_space:
- case XK_KP_Space: *key = K_SPACE; break;
+
+ // https://zerowing.idsoftware.com/bugzilla/show_bug.cgi?id=472
+ case XK_space:
+ case XK_KP_Space: *key = K_SPACE; break;
default:
if (XLookupRet == 0)
@@ -344,16 +353,20 @@ static char *XLateKey(XKeyEvent *ev, int *key)
else
{
// XK_* tests failed, but XLookupString got a buffer, so let's try it
- *key = *(unsigned char *)buf;
- if (*key >= 'A' && *key <= 'Z')
- *key = *key - 'A' + 'a';
- // if ctrl is pressed, the keys are not between 'A' and 'Z', for instance ctrl-z == 26 ^Z ^C etc.
- // see https://zerowing.idsoftware.com/bugzilla/show_bug.cgi?id=19
- else if (*key >= 1 && *key <= 26)
- *key = *key + 'a' - 1;
+ if (in_shiftedKeys->integer) {
+ *key = *(unsigned char *)buf;
+ if (*key >= 'A' && *key <= 'Z')
+ *key = *key - 'A' + 'a';
+ // if ctrl is pressed, the keys are not between 'A' and 'Z', for instance ctrl-z == 26 ^Z ^C etc.
+ // see https://zerowing.idsoftware.com/bugzilla/show_bug.cgi?id=19
+ else if (*key >= 1 && *key <= 26)
+ *key = *key + 'a' - 1;
+ } else {
+ *key = bufnomod[0];
+ }
}
break;
- }
+ }
return buf;
}
@@ -1151,7 +1164,7 @@ int GLW_SetMode( const char *drivername, int mode, qboolean fullscreen )
0, visinfo->depth, InputOutput,
visinfo->visual, mask, &attr);
- XStoreName( dpy, win, WINDOW_CLASS_NAME );
+ XStoreName( dpy, win, CLIENT_WINDOW_TITLE );
/* GH: Don't let the window be resized */
sizehints.flags = PMinSize | PMaxSize;
@@ -1679,6 +1692,7 @@ void IN_Init(void) {
// mouse variables
in_mouse = Cvar_Get ("in_mouse", "1", CVAR_ARCHIVE);
in_dgamouse = Cvar_Get ("in_dgamouse", "1", CVAR_ARCHIVE);
+ in_shiftedKeys = Cvar_Get ("in_shiftedKeys", "0", CVAR_ARCHIVE);
// turn on-off sub-frame timing of X events
in_subframe = Cvar_Get ("in_subframe", "1", CVAR_ARCHIVE);
diff --git a/src/unix/sdl_glimp.c b/src/unix/sdl_glimp.c
index c286bf72..f7720790 100644
--- a/src/unix/sdl_glimp.c
+++ b/src/unix/sdl_glimp.c
@@ -90,9 +90,6 @@ typedef void *QGLContext;
static QGLContext opengl_context;
-#define WINDOW_CLASS_NAME "Tremulous"
-#define WINDOW_CLASS_NAME_BRIEF "Tremulous"
-
//#define KBD_DBG
typedef enum
@@ -266,7 +263,14 @@ static const char *XLateKey(SDL_keysym *keysym, int *key)
//else if (ch >= 'A' && ch <= 'Z')
// ch = ch - 'A' + 'a';
- buf[0] = ch;
+ // tjw: translate K_BACKSPACE to ctrl-h for MACOS_X (others?)
+ if (ch == K_BACKSPACE)
+ {
+ *key = 'h' - 'a' + 1;
+ buf[0] = *key;
+ }
+ else
+ buf[0] = ch;
}
return buf;
@@ -633,7 +637,7 @@ static int GLW_SetMode( const char *drivername, int mode, qboolean fullscreen )
SDL_GL_SetAttribute( SDL_GL_STENCIL_SIZE, tstencilbits );
SDL_GL_SetAttribute( SDL_GL_DOUBLEBUFFER, 1 );
- SDL_WM_SetCaption(WINDOW_CLASS_NAME, WINDOW_CLASS_NAME_BRIEF);
+ SDL_WM_SetCaption(CLIENT_WINDOW_TITLE, CLIENT_WINDOW_ICON);
SDL_ShowCursor(0);
SDL_EnableUNICODE(1);
SDL_EnableKeyRepeat(SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
diff --git a/src/unix/unix_net.c b/src/unix/unix_net.c
index 853687ed..a7d8a088 100644
--- a/src/unix/unix_net.c
+++ b/src/unix/unix_net.c
@@ -351,12 +351,25 @@ NET_GetLocalAddress
=====================
*/
#ifdef MACOS_X
-// Don't do a forward mapping from the hostname of the machine to the IP. The reason is that we might have obtained an IP address from DHCP and there might not be any name registered for the machine. On Mac OS X, the machine name defaults to 'localhost' and NetInfo has 127.0.0.1 listed for this name. Instead, we want to get a list of all the IP network interfaces on the machine.
-// This code adapted from OmniNetworking.
-
-#define IFR_NEXT(ifr) \
- ((struct ifreq *) ((char *) (ifr) + sizeof(*(ifr)) + \
- MAX(0, (int) (ifr)->ifr_addr.sa_len - (int) sizeof((ifr)->ifr_addr))))
+// Don't do a forward mapping from the hostname of the machine to the IP.
+// The reason is that we might have obtained an IP address from DHCP and
+// there might not be any name registered for the machine. On Mac OS X,
+// the machine name defaults to 'localhost' and NetInfo has 127.0.0.1
+// listed for this name. Instead, we want to get a list of all the IP
+// network interfaces on the machine. This code adapted from
+// OmniNetworking.
+
+
+#ifdef _SIZEOF_ADDR_IFREQ
+ // tjw: OSX 10.4 does not have sa_len
+ #define IFR_NEXT(ifr) \
+ ((struct ifreq *) ((char *) ifr + _SIZEOF_ADDR_IFREQ(*ifr)))
+#else
+ // tjw: assume that once upon a time some version did have sa_len
+ #define IFR_NEXT(ifr) \
+ ((struct ifreq *) ((char *) (ifr) + sizeof(*(ifr)) + \
+ MAX(0, (int) (ifr)->ifr_addr.sa_len - (int) sizeof((ifr)->ifr_addr))))
+#endif
void NET_GetLocalAddress( void ) {
struct ifreq requestBuffer[MAX_IPS], *linkInterface, *inetInterface;
@@ -366,7 +379,7 @@ void NET_GetLocalAddress( void ) {
int interfaceSocket;
int family;
- //Com_Printf("NET_GetLocalAddress: Querying for network interfaces\n");
+ Com_Printf("NET_GetLocalAddress: Querying for network interfaces\n");
// Set this early so we can just return if there is an error
numIP = 0;
@@ -374,7 +387,10 @@ void NET_GetLocalAddress( void ) {
ifc.ifc_len = sizeof(requestBuffer);
ifc.ifc_buf = (caddr_t)requestBuffer;
- // Since we get at this info via an ioctl, we need a temporary little socket. This will only get AF_INET interfaces, but we probably don't care about anything else. If we do end up caring later, we should add a ONAddressFamily and at a -interfaces method to it.
+ // Since we get at this info via an ioctl, we need a temporary little socket.
+ // This will only get AF_INET interfaces, but we probably don't care about
+ // anything else. If we do end up caring later, we should add a
+ // ONAddressFamily and at a -interfaces method to it.
family = AF_INET;
if ((interfaceSocket = socket(family, SOCK_DGRAM, 0)) < 0) {
Com_Printf("NET_GetLocalAddress: Unable to create temporary socket, errno = %d\n", errno);
@@ -391,7 +407,14 @@ void NET_GetLocalAddress( void ) {
while ((char *) linkInterface < &ifc.ifc_buf[ifc.ifc_len]) {
unsigned int nameLength;
- // The ioctl returns both the entries having the address (AF_INET) and the link layer entries (AF_LINK). The AF_LINK entry has the link layer address which contains the interface type. This is the only way I can see to get this information. We cannot assume that we will get bot an AF_LINK and AF_INET entry since the interface may not be configured. For example, if you have a 10Mb port on the motherboard and a 100Mb card, you may not configure the motherboard port.
+ // The ioctl returns both the entries having the address (AF_INET)
+ // and the link layer entries (AF_LINK). The AF_LINK entry has the
+ // link layer address which contains the interface type. This is the
+ // only way I can see to get this information. We cannot assume that
+ // we will get bot an AF_LINK and AF_INET entry since the interface
+ // may not be configured. For example, if you have a 10Mb port on
+ // the motherboard and a 100Mb card, you may not configure the
+ // motherboard port.
// For each AF_LINK entry...
if (linkInterface->ifr_addr.sa_family == AF_LINK) {
@@ -399,7 +422,8 @@ void NET_GetLocalAddress( void ) {
inetInterface = (struct ifreq *) ifc.ifc_buf;
while ((char *) inetInterface < &ifc.ifc_buf[ifc.ifc_len]) {
if (inetInterface->ifr_addr.sa_family == AF_INET &&
- !strncmp(inetInterface->ifr_name, linkInterface->ifr_name, sizeof(linkInterface->ifr_name))) {
+ !strncmp(inetInterface->ifr_name, linkInterface->ifr_name,
+ sizeof(linkInterface->ifr_name))) {
for (nameLength = 0; nameLength < IFNAMSIZ; nameLength++)
if (!linkInterface->ifr_name[nameLength])
@@ -411,7 +435,8 @@ void NET_GetLocalAddress( void ) {
// Get the local interface address
strncpy(ifr.ifr_name, inetInterface->ifr_name, sizeof(ifr.ifr_name));
if (ioctl(interfaceSocket, OSIOCGIFADDR, (caddr_t)&ifr) < 0) {
- Com_Printf("NET_GetLocalAddress: Unable to get local address for interface '%s', errno = %d\n", inetInterface->ifr_name, errno);
+ Com_Printf("NET_GetLocalAddress: Unable to get local address "
+ "for interface '%s', errno = %d\n", inetInterface->ifr_name, errno);
} else {
struct sockaddr_in *sin;
int ip;
@@ -423,7 +448,10 @@ void NET_GetLocalAddress( void ) {
localIP[ numIP ][1] = (ip >> 16) & 0xff;
localIP[ numIP ][2] = (ip >> 8) & 0xff;
localIP[ numIP ][3] = (ip >> 0) & 0xff;
- Com_Printf( "IP: %i.%i.%i.%i (%s)\n", localIP[ numIP ][0], localIP[ numIP ][1], localIP[ numIP ][2], localIP[ numIP ][3], inetInterface->ifr_name);
+ Com_Printf( "IP: %i.%i.%i.%i (%s)\n",
+ localIP[ numIP ][0], localIP[ numIP ][1],
+ localIP[ numIP ][2], localIP[ numIP ][3],
+ inetInterface->ifr_name);
numIP++;
}
}
@@ -438,6 +466,7 @@ void NET_GetLocalAddress( void ) {
}
linkInterface = IFR_NEXT(linkInterface);
}
+ Com_Printf("NET_GetLocalAddress: DONE querying for network interfaces\n");
close(interfaceSocket);
}
diff --git a/src/win32/win_glimp.c b/src/win32/win_glimp.c
index ce23123e..187fd7b9 100644
--- a/src/win32/win_glimp.c
+++ b/src/win32/win_glimp.c
@@ -58,8 +58,6 @@ typedef enum {
#define TRY_PFD_FAIL_SOFT 1
#define TRY_PFD_FAIL_HARD 2
-#define WINDOW_CLASS_NAME "Tremulous"
-
static void GLW_InitExtensions( void );
static rserr_t GLW_SetMode( const char *drivername,
int mode,
@@ -601,7 +599,7 @@ static qboolean GLW_CreateWindow( const char *drivername, int width, int height,
wc.hCursor = LoadCursor (NULL,IDC_ARROW);
wc.hbrBackground = (void *)COLOR_GRAYTEXT;
wc.lpszMenuName = 0;
- wc.lpszClassName = WINDOW_CLASS_NAME;
+ wc.lpszClassName = CLIENT_WINDOW_TITLE;
if ( !RegisterClass( &wc ) )
{
@@ -670,8 +668,8 @@ static qboolean GLW_CreateWindow( const char *drivername, int width, int height,
g_wv.hWnd = CreateWindowEx (
exstyle,
- WINDOW_CLASS_NAME,
- "Tremulous",
+ CLIENT_WINDOW_TITLE,
+ CLIENT_WINDOW_TITLE,
stylebits,
x, y, w, h,
NULL,
diff --git a/src/win32/win_syscon.c b/src/win32/win_syscon.c
index abce4cb7..7fa21a4f 100644
--- a/src/win32/win_syscon.c
+++ b/src/win32/win_syscon.c
@@ -335,7 +335,7 @@ void Sys_CreateConsole( void )
s_wcd.hWnd = CreateWindowEx( 0,
DEDCLASS,
- "Tremulous Console",
+ CONSOLE_WINDOW_TITLE,
DEDSTYLE,
( swidth - 600 ) / 2, ( sheight - 450 ) / 2 , rect.right - rect.left + 1, rect.bottom - rect.top + 1,
NULL,
generated by cgit (git 2.34.1) at 2024-11-15 02:31:11 +0000