qf/quake2forge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quake2forge synced 2024-12-12 13:42:21 +00:00
Code Issues Projects Releases Packages Wiki Activity

* Got rid of -Dstricmp=strcasecmp

Browse source
This commit is contained in:
Jamie Wilkinson 2002-04-06 05:31:01 +00:00
parent 1688fc5eee
commit 0bd2f30658
9 changed files with 28 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
game/ctf/Makefile.am
View file

@ -30,5 +30,5 @@ game_so_SOURCES = \
q_shared.c
AM_CFLAGS = -fPIC -Wall -Werror -pipe
AM_CPPFLAGS = -I../../src -I.. -Dstricmp=strcasecmp
AM_CPPFLAGS = -I../../src -I..
LDFLAGS = -shared

4
game/ctf/g_ctf.c
View file

@ -3218,10 +3218,10 @@ int CTFUpdateJoinMenu(edict_t *ent)
}
if (ctf_forcejoin->string && *ctf_forcejoin->string) {
if (stricmp(ctf_forcejoin->string, "red") == 0) {
if (strcasecmp(ctf_forcejoin->string, "red") == 0) {
joinmenu[jmenu_blue].text = NULL;
joinmenu[jmenu_blue].SelectFunc = NULL;
} else if (stricmp(ctf_forcejoin->string, "blue") == 0) {
} else if (strcasecmp(ctf_forcejoin->string, "blue") == 0) {
joinmenu[jmenu_red].text = NULL;
joinmenu[jmenu_red].SelectFunc = NULL;
}

2
game/ctf/g_spawn.c
View file

@ -589,7 +589,7 @@ void SpawnEntities (char *mapname, char *entities, char *spawnpoint)
entities = ED_ParseEdict (entities, ent);
// yet another map hack
if (!stricmp(level.mapname, "command") && !stricmp(ent->classname, "trigger_once") && !stricmp(ent->model, "*27"))
if (!strcasecmp(level.mapname, "command") && !strcasecmp(ent->classname, "trigger_once") && !strcasecmp(ent->model, "*27"))
ent->spawnflags &= ~SPAWNFLAG_NOT_HARD;
// remove things (except the world) from different skill levels or deathmatch

4
game/ctf/g_target.c
View file

@ -176,7 +176,7 @@ void SP_target_secret (edict_t *ent)
ent->svflags = SVF_NOCLIENT;
level.total_secrets++;
// map bug hack
if (!stricmp(level.mapname, "mine3") && ent->s.origin[0] == 280 && ent->s.origin[1] == -2048 && ent->s.origin[2] == -624)
if (!strcasecmp(level.mapname, "mine3") && ent->s.origin[0] == 280 && ent->s.origin[1] == -2048 && ent->s.origin[2] == -624)
ent->message = "You have found a secret area.";
}
@ -309,7 +309,7 @@ void SP_target_changelevel (edict_t *ent)
}
// ugly hack because *SOMEBODY* screwed up their map
if((stricmp(level.mapname, "fact1") == 0) && (stricmp(ent->map, "fact3") == 0))
if((strcasecmp(level.mapname, "fact1") == 0) && (strcasecmp(ent->map, "fact3") == 0))
ent->map = "fact3$secret1";
ent->use = use_target_changelevel;

34
game/ctf/p_client.c
View file

@ -51,7 +51,7 @@ static void SP_FixCoopSpots (edict_t *self)
VectorSubtract(self->s.origin, spot->s.origin, d);
if (VectorLength(d) < 384)
{
if ((!self->targetname) || stricmp(self->targetname, spot->targetname) != 0)
if ((!self->targetname) || strcasecmp(self->targetname, spot->targetname) != 0)
{
// gi.dprintf("FixCoopSpots changed %s at %s targetname from %s to %s\n", self->classname, vtos(self->s.origin), self->targetname, spot->targetname);
self->targetname = spot->targetname;
@ -69,7 +69,7 @@ static void SP_CreateCoopSpots (edict_t *self)
{
edict_t *spot;
if(stricmp(level.mapname, "security") == 0)
if(strcasecmp(level.mapname, "security") == 0)
{
spot = G_Spawn();
spot->classname = "info_player_coop";
@ -107,7 +107,7 @@ void SP_info_player_start(edict_t *self)
{
if (!coop->value)
return;
if(stricmp(level.mapname, "security") == 0)
if(strcasecmp(level.mapname, "security") == 0)
{
// invoke one of our gross, ugly, disgusting hacks
self->think = SP_CreateCoopSpots;
@ -140,20 +140,20 @@ void SP_info_player_coop(edict_t *self)
return;
}
if((stricmp(level.mapname, "jail2") == 0) ||
(stricmp(level.mapname, "jail4") == 0) ||
(stricmp(level.mapname, "mine1") == 0) ||
(stricmp(level.mapname, "mine2") == 0) ||
(stricmp(level.mapname, "mine3") == 0) ||
(stricmp(level.mapname, "mine4") == 0) ||
(stricmp(level.mapname, "lab") == 0) ||
(stricmp(level.mapname, "boss1") == 0) ||
(stricmp(level.mapname, "fact3") == 0) ||
(stricmp(level.mapname, "biggun") == 0) ||
(stricmp(level.mapname, "space") == 0) ||
(stricmp(level.mapname, "command") == 0) ||
(stricmp(level.mapname, "power2") == 0) ||
(stricmp(level.mapname, "strike") == 0))
if((strcasecmp(level.mapname, "jail2") == 0) ||
(strcasecmp(level.mapname, "jail4") == 0) ||
(strcasecmp(level.mapname, "mine1") == 0) ||
(strcasecmp(level.mapname, "mine2") == 0) ||
(strcasecmp(level.mapname, "mine3") == 0) ||
(strcasecmp(level.mapname, "mine4") == 0) ||
(strcasecmp(level.mapname, "lab") == 0) ||
(strcasecmp(level.mapname, "boss1") == 0) ||
(strcasecmp(level.mapname, "fact3") == 0) ||
(strcasecmp(level.mapname, "biggun") == 0) ||
(strcasecmp(level.mapname, "space") == 0) ||
(strcasecmp(level.mapname, "command") == 0) ||
(strcasecmp(level.mapname, "power2") == 0) ||
(strcasecmp(level.mapname, "strike") == 0))
{
// invoke one of our gross, ugly, disgusting hacks
self->think = SP_FixCoopSpots;

4
game/ctf/p_weapon.c
View file

@ -550,12 +550,12 @@ void Weapon_Generic (edict_t *ent, int FRAME_ACTIVATE_LAST, int FRAME_FIRE_LAST,
fire_frames, fire);
// run the weapon frame again if hasted
if (stricmp(ent->client->pers.weapon->pickup_name, "Grapple") == 0 &&
if (strcasecmp(ent->client->pers.weapon->pickup_name, "Grapple") == 0 &&
ent->client->weaponstate == WEAPON_FIRING)
return;
if ((CTFApplyHaste(ent) ||
(Q_stricmp(ent->client->pers.weapon->pickup_name, "Grapple") == 0 &&
(Q_strcasecmp(ent->client->pers.weapon->pickup_name, "Grapple") == 0 &&
ent->client->weaponstate != WEAPON_FIRING))
&& oldstate == ent->client->weaponstate) {
Weapon_Generic2 (ent, FRAME_ACTIVATE_LAST, FRAME_FIRE_LAST,

2
game/xatrix/Makefile.am
View file

@ -56,5 +56,5 @@ game_so_SOURCES = \
q_shared.c
AM_CFLAGS = -fPIC -Wall -Werror -pipe
AM_CPPFLAGS = -I../../src -I.. -Dstricmp=strcasecmp
AM_CPPFLAGS = -I../../src -I..
LDFLAGS = -shared

14
src/Makefile.am
View file

@ -94,20 +94,8 @@ ref_softx_so_SOURCES = $(REF_SOFT_COMMON) rw_x11.c
# SDL
#ref_softsdl_so_SOURCES = $(REF_SOFT_COMMON) rw_sdl.c
$(BUILDDIR)/ref_soft.$(SHLIBEXT) : $(REF_SOFT_OBJS) $(REF_SOFT_SVGA_OBJS)
$(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(REF_SOFT_OBJS) \
$(REF_SOFT_SVGA_OBJS) $(SVGALDFLAGS)
$(BUILDDIR)/ref_softx.$(SHLIBEXT) : $(REF_SOFT_OBJS) $(REF_SOFT_X11_OBJS)
$(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(REF_SOFT_OBJS) \
$(REF_SOFT_X11_OBJS) $(XLDFLAGS)
$(BUILDDIR)/ref_softsdl.$(SHLIBEXT) : $(REF_SOFT_OBJS) $(REF_SOFT_SDL_OBJS)
$(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(REF_SOFT_OBJS) \
$(REF_SOFT_SDL_OBJS) $(SDLLDFLAGS)
AM_CFLAGS = -Wall -Werror -pipe
AM_CPPFLAGS = -Dstricmp=strcasecmp -I../game
AM_CPPFLAGS = -I../game
ref_glx_so_CFLAGS = -fPIC -I/usr/X11R6/include
ref_glx_so_LDFLAGS = -shared -L/usr/X11R6/lib -lX11 -lXext -lXxf86dga -lXxf86vm

2
src/net_udp.c
View file

@ -503,7 +503,7 @@ int NET_Socket (char *net_interface, int port)
return 0;
}
if (!net_interface || !net_interface[0] || !stricmp(net_interface, "localhost"))
if (!net_interface || !net_interface[0] || !strcasecmp(net_interface, "localhost"))
address.sin_addr.s_addr = INADDR_ANY;
else
NET_StringToSockaddr (net_interface, (struct sockaddr *)&address);