File fix-serious-compiler-warnings.patch of Package alienarena
diff -Nur alienarena-7.71.2/source/client/menu.c new/source/client/menu.c
--- alienarena-7.71.2/source/client/menu.c 2021-03-11 23:52:39.289530028 +0100
+++ new/source/client/menu.c 2021-03-12 00:39:11.485588824 +0100
@@ -46,6 +46,7 @@
#include <io.h>
#endif
+#include <string.h>
#include "curl/curl.h"
#include "client.h"
@@ -1703,7 +1704,7 @@
Cvar_SetValue( cvarname, self->curvalue );
- if (cvarname == "vid_fullscreen" &&
+ if (strcmp(cvarname, "vid_fullscreen") == 0 &&
(self->curvalue == windowmode_borderless_windowed || self->curvalue == windowmode_exclusive_fullscreen))
{
// Store preferred full screen mode for toggling between windowed and fullscreen with alt-enter
@@ -1883,7 +1884,7 @@
if (num != clamped_num)
Com_sprintf (self->buffer, sizeof(self->buffer), "%d ^1(%d)", num, clamped_num);
- if ((cvarname == "vid_width" || cvarname == "vid_height") &&
+ if ((strcmp(cvarname, "vid_width") == 0 || strcmp(cvarname, "vid_height") == 0) &&
clamped_num != Cvar_Get(cvarname, "0", CVAR_ARCHIVE)->integer)
{
Cvar_SetValue ("gl_mode", resolution_custom);
@@ -1967,7 +1968,7 @@
case option_spincontrol:
item->generic.type = MTYPE_SPINCONTROL;
- if (optionname->cvarname == "vid_fullscreen" &&
+ if (strcmp(optionname->cvarname, "vid_fullscreen") == 0 &&
Cvar_Get( "vid_fullscreen", "1", CVAR_ARCHIVE|CVARDOC_INT)->integer == windowmode_exclusive_fullscreen)
{
// Show fullscreen (legacy) as well
diff -Nur alienarena-7.71.2/source/game/acesrc/acebot_ai.c new/source/game/acesrc/acebot_ai.c
--- alienarena-7.71.2/source/game/acesrc/acebot_ai.c 2021-03-11 23:52:38.697525776 +0100
+++ new/source/game/acesrc/acebot_ai.c 2021-03-12 01:02:14.911519094 +0100
@@ -92,6 +92,7 @@
#include "game/m_player.h"
#include "acebot.h"
+#include <string.h>
///////////////////////////////////////////////////////////////////////
// Main Think function for bot
@@ -576,28 +577,28 @@
}
if(self->ctype == 1)
{
- if(target->classname == "hbomb")
+ if(strcmp(target->classname, "hbomb") == 0)
return false; //prevents them from accidently destorying a planted bomb
- else if(target->classname == "alien computer")
+ else if(strcmp(target->classname, "alien computer") == 0)
self->enemy = target;
- else if(target->classname == "alien powersrc")
+ else if(strcmp(target->classname, "alien powersrc") == 0)
self->enemy = target;
- else if(target->classname == "alien ammodepot")
+ else if(strcmp(target->classname, "alien ammodepot") == 0)
self->enemy = target;
- else if(target->classname == "alien backupgen")
+ else if(strcmp(target->classname, "alien backupgen") == 0)
self->enemy = target;
}
else if(self->ctype == 0)
{
- if(target->classname == "abomb")
+ if(strcmp(target->classname, "abomb") == 0)
return false;
- else if(target->classname == "human computer")
+ else if(strcmp(target->classname, "human computer") == 0)
self->enemy = target;
- else if(target->classname == "human powersrc")
+ else if(strcmp(target->classname, "human powersrc") == 0)
self->enemy = target;
- else if(target->classname == "human ammodepot")
+ else if(strcmp(target->classname, "human ammodepot") == 0)
self->enemy = target;
- else if(target->classname == "human backupgen")
+ else if(strcmp(target->classname, "human backupgen") == 0)
self->enemy = target;
}
target = findradius(target, self->s.origin, 200);
@@ -812,8 +813,8 @@
if(g_tactical->integer)
{
if(self->has_bomb && self->ctype == 0
- && (self->enemy->classname == "human computer" || self->enemy->classname == "human powersrc"
- || self->enemy->classname == "human ammodepot"))
+ && (strcmp(self->enemy->classname, "human computer") == 0 || strcmp(self->enemy->classname, "human powersrc") == 0
+ || strcmp(self->enemy->classname, "human ammodepot") == 0))
{
if(range < 300.0f)
{
@@ -822,8 +823,8 @@
}
}
else if(self->has_bomb && self->ctype == 1
- && (self->enemy->classname == "alien computer" || self->enemy->classname == "alien powersrc"
- || self->enemy->classname == "alien ammodepot"))
+ && (strcmp(self->enemy->classname, "alien computer") == 0 || strcmp(self->enemy->classname, "alien powersrc") == 0
+ || strcmp(self->enemy->classname, "alien ammodepot") == 0))
{
if(range < 300.0f)
{
diff -Nur alienarena-7.71.2/source/game/g_misc.c new/source/game/g_misc.c
--- alienarena-7.71.2/source/game/g_misc.c 2021-03-11 23:52:38.925527413 +0100
+++ new/source/game/g_misc.c 2021-03-12 01:26:23.261907224 +0100
@@ -24,6 +24,7 @@
#endif
#include "g_local.h"
+#include <string.h>
/*QUAKED func_group (0 0 0) ?
@@ -1294,7 +1295,7 @@
//computers
void computer_think (edict_t *ent)
{
- if(ent->classname == "alien computer")
+ if(strcmp(ent->classname, "alien computer") == 0)
tacticalScore.alienComputerHealth = ent->health/15;
else
tacticalScore.humanComputerHealth = ent->health/15;
@@ -1312,7 +1313,7 @@
self->activator = attacker;
gi.WriteByte (svc_temp_entity);
- if(self->classname == "alien computer")
+ if(strcmp(self->classname, "alien computer") == 0)
{
tacticalScore.alienComputer = false;
tacticalScore.alienComputerHealth = 0;
@@ -1327,7 +1328,7 @@
gi.WritePosition (self->s.origin);
gi.multicast (self->s.origin, MULTICAST_PHS);
- if(self->classname == "alien computer")
+ if(strcmp(self->classname, "alien computer") == 0)
{
for (i=0 ; i<g_maxclients->value ; i++)
{
@@ -1418,7 +1419,7 @@
//power sources
void powersrc_think (edict_t *ent)
{
- if(ent->classname == "alien powersrc")
+ if(strcmp(ent->classname, "alien powersrc") == 0)
tacticalScore.alienPowerSourceHealth = ent->health/15;
else
tacticalScore.humanPowerSourceHealth = ent->health/15;
@@ -1435,7 +1436,7 @@
self->activator = attacker;
gi.WriteByte (svc_temp_entity);
- if(self->classname == "alien powersrc")
+ if(strcmp(self->classname, "alien powersrc") == 0)
{
tacticalScore.alienPowerSource = false;
tacticalScore.alienPowerSourceHealth = 0;
@@ -1450,7 +1451,7 @@
gi.WritePosition (self->s.origin);
gi.multicast (self->s.origin, MULTICAST_PHS);
- if(self->classname == "alien powersrc")
+ if(strcmp(self->classname, "alien powersrc") == 0)
{
for (i=0 ; i<g_maxclients->value ; i++)
{
@@ -1541,7 +1542,7 @@
//ammo depots
void ammodepot_think (edict_t *ent)
{
- if(ent->classname == "alien ammodepot")
+ if(strcmp(ent->classname, "alien ammodepot") == 0)
tacticalScore.alienAmmoDepotHealth = ent->health/15;
else
tacticalScore.humanAmmoDepotHealth = ent->health/15;
@@ -1557,7 +1558,7 @@
self->activator = attacker;
gi.WriteByte (svc_temp_entity);
- if(self->classname == "alien ammodepot")
+ if(strcmp(self->classname, "alien ammodepot") == 0)
{
tacticalScore.alienAmmoDepot = false;
tacticalScore.alienAmmoDepotHealth = 0;
@@ -1572,7 +1573,7 @@
gi.WritePosition (self->s.origin);
gi.multicast (self->s.origin, MULTICAST_PHS);
- if(self->classname == "alien ammodepot")
+ if(strcmp(self->classname, "alien ammodepot") == 0)
{
for (i=0 ; i<g_maxclients->value ; i++)
{
@@ -1663,7 +1664,7 @@
//Backup generators
void backupgen_think (edict_t *ent)
{
- if(ent->classname == "alien backupgen")
+ if(strcmp(ent->classname, "alien backupgen") == 0)
{
if(!tacticalScore.alienPowerSource)
{
@@ -1692,7 +1693,7 @@
self->activator = attacker;
gi.WriteByte (svc_temp_entity);
- if(self->classname == "alien backupgen")
+ if(strcmp(self->classname, "alien backupgen") == 0)
{
tacticalScore.alienBackupGen = false;
gi.WriteByte (TE_BFG_BIGEXPLOSION);
@@ -1705,7 +1706,7 @@
gi.WritePosition (self->s.origin);
gi.multicast (self->s.origin, MULTICAST_PHS);
- if(self->classname == "alien backupgen")
+ if(strcmp(self->classname, "alien backupgen") == 0)
{
for (i=0 ; i<g_maxclients->value ; i++)
{
@@ -1820,35 +1821,35 @@
if (self->client->pers.weapon == FindItem("Alien Bomb"))
safe_centerprintf(self, "Press <fire> to plant a bomb!");
- if(ent->classname == "human powersrc")
+ if(strcmp(ent->classname, "human powersrc") == 0)
{
if(self->has_bomb)
safe_centerprintf(self, "Plant a bomb here or fire weapon on power source.");
else
safe_centerprintf(self, "Fire weapon on power source to destroy it!");
}
- else if(ent->classname == "human ammodepot")
+ else if(strcmp(ent->classname, "human ammodepot") == 0)
{
if(self->has_bomb)
safe_centerprintf(self, "Plant a bomb here or fire weapon on ammo depot.");
else
safe_centerprintf(self, "Fire weapon on ammo depot to destroy it!");
}
- else if(ent->classname == "human computer")
+ else if(strcmp(ent->classname, "human computer") == 0)
{
if(self->has_bomb)
safe_centerprintf(self, "Plant a bomb here or fire weapon on computer.");
else
safe_centerprintf(self, "Fire weapon on computer to destroy it!");
}
- else if(ent->classname == "human backupgen")
+ else if(strcmp(ent->classname, "human backupgen") == 0)
{
if(self->has_bomb)
safe_centerprintf(self, "Plant a bomb here or fire weapon on backup generator.");
else
safe_centerprintf(self, "Fire weapon on backup generator to destroy it!");
}
- else if(ent->classname == "abomb")
+ else if(strcmp(ent->classname, "abomb") == 0)
{
if(self->has_detonator)
safe_centerprintf(self, "Touch this bomb to activate it!");
@@ -1859,35 +1860,35 @@
if (self->client->pers.weapon == FindItem("Human Bomb"))
safe_centerprintf(self, "Press <fire> to plant a bomb!");
- if(ent->classname == "alien powersrc")
+ if(strcmp(ent->classname, "alien powersrc") == 0)
{
if(self->has_bomb)
safe_centerprintf(self, "Plant a bomb here or fire weapon on power source.");
else
safe_centerprintf(self, "Fire weapon on power source to destroy it!");
}
- else if(ent->classname == "alien ammodepot")
+ else if(strcmp(ent->classname, "alien ammodepot") == 0)
{
if(self->has_bomb)
safe_centerprintf(self, "Plant a bomb here or fire weapon on ammo depot.");
else
safe_centerprintf(self, "Fire weapon on ammo depot to destroy it!");
}
- else if(ent->classname == "alien computer")
+ else if(strcmp(ent->classname, "alien computer") == 0)
{
if(self->has_bomb)
safe_centerprintf(self, "Plant a bomb here or fire weapon on computer.");
else
safe_centerprintf(self, "Fire weapon on computer to destroy it!");
}
- else if(ent->classname == "alien backupgen")
+ else if(strcmp(ent->classname, "alien backupgen") == 0)
{
if(self->has_bomb)
safe_centerprintf(self, "Plant a bomb here or fire weapon on backup generator.");
else
safe_centerprintf(self, "Fire weapon on backup generator to destroy it!");
}
- else if(ent->classname == "hbomb")
+ else if(strcmp(ent->classname, "hbomb") == 0)
{
if(self->has_detonator)
safe_centerprintf(self, "Touch this bomb to activate it!");
@@ -1915,4 +1916,4 @@
ent->lastTmsg = level.time;
}
-}
\ Kein Zeilenumbruch am Dateiende.
+}
diff -Nur alienarena-7.71.2/source/game/g_trigger.c new/source/game/g_trigger.c
--- alienarena-7.71.2/source/game/g_trigger.c 2021-03-11 23:52:38.929527441 +0100
+++ new/source/game/g_trigger.c 2021-03-12 00:45:13.404187452 +0100
@@ -23,7 +23,7 @@
#endif
#include "g_local.h"
-
+#include <string.h>
void InitTrigger (edict_t *self)
{
@@ -544,7 +544,7 @@
if (other->svflags & SVF_DEADMONSTER)
return;
- if((other->s.effects & EF_GIB) || (other->classname == "g_gib"))
+ if((other->s.effects & EF_GIB) || strcmp(other->classname, "g_gib") == 0)
return;
// set XY even if not on ground, so the jump will clear lips
diff -Nur alienarena-7.71.2/source/game/g_weapon.c new/source/game/g_weapon.c
--- alienarena-7.71.2/source/game/g_weapon.c 2021-03-11 23:52:38.925527413 +0100
+++ new/source/game/g_weapon.c 2021-03-12 00:46:31.100745320 +0100
@@ -23,6 +23,7 @@
#endif
#include "g_local.h"
+#include <string.h>
#ifdef ALTERIA
@@ -2136,7 +2137,7 @@
gi.sound( &g_edicts[1], CHAN_AUTO, gi.soundindex( "world/explosion1.wav" ), 1, ATTN_NONE, 0 );
gi.WriteByte (svc_temp_entity);
- if(self->classname == "abomb")
+ if(strcmp(self->classname, "abomb") == 0)
gi.WriteByte (TE_BFG_BIGEXPLOSION);
else
gi.WriteByte (TE_ROCKET_EXPLOSION); //might want different, massive effect here
@@ -2225,7 +2226,7 @@
T_RadiusDamage(self, self->owner, self->radius_dmg/div, NULL, self->dmg_radius/div, MOD_R_SPLASH, 0);
gi.WriteByte (svc_temp_entity);
- if(self->classname == "abomb")
+ if(strcmp(self->classname, "abomb") == 0)
gi.WriteByte (TE_BFG_BIGEXPLOSION);
else
gi.WriteByte (TE_ROCKET_EXPLOSION);
