Added Zaero expansion to XCode workspace.

kondrak · Dec 12, 2019 · 46357f1 · 46357f1
1 parent 916fc2b
commit 46357f1
Show file tree

Hide file tree

Showing 19 changed files with 761 additions and 50 deletions.
diff --git a/macos/vkQuake2.xcworkspace/contents.xcworkspacedata b/macos/vkQuake2.xcworkspace/contents.xcworkspacedata
diff --git a/macos/vkQuake2.xcworkspace/xcshareddata/xcschemes/vkQuake2.xcscheme b/macos/vkQuake2.xcworkspace/xcshareddata/xcschemes/vkQuake2.xcscheme
@@ -90,15 +90,27 @@
                ReferencedContainer = "container:../xatrix/macos/xatrix.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "E295520021F618E100336DD3"
+               BuildableName = "zaero.dylib"
+               BlueprintName = "zaero"
+               ReferencedContainer = "container:../zaero/macos/zaero.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
       </BuildActionEntries>
    </BuildAction>
    <TestAction
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES">
-      <Testables>
-      </Testables>
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
@@ -108,8 +120,8 @@
             ReferencedContainer = "container:quake2.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
+      <Testables>
+      </Testables>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -144,8 +156,6 @@
             isEnabled = "YES">
          </EnvironmentVariable>
       </EnvironmentVariables>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"

diff --git a/zaero/g_cmds.c b/zaero/g_cmds.c
@@ -455,7 +455,6 @@ void findNext(edict_t *ent, struct altsel_s *ptr, int offset)
 
 void altSelect(edict_t *ent, int num)
 {
-	int index = 0;
 	int offset = -1;
 	int i = 0;
 	struct altsel_s *ptr = NULL;
@@ -485,7 +484,8 @@ void altSelect(edict_t *ent, int num)
 		offset = 0;
 	else
 	{
-		offset = ((++offset) % ptr->num);
+		++offset;
+		offset = offset % ptr->num;
 	}
 
 	// now select this offset

diff --git a/zaero/g_combat.c b/zaero/g_combat.c
@@ -156,10 +156,10 @@ static int CheckPowerArmor (edict_t *ent, vec3_t point, vec3_t normal, int damag
 	gclient_t	*client;
 	int			save;
 	int			power_armor_type;
-	int			index;
+	int			index = 0;
 	int			damagePerCell;
 	int			pa_te_type;
-	int			power;
+	int			power = 0;
 	int			power_used;
 
 	if (!damage)

diff --git a/zaero/g_func.c b/zaero/g_func.c
@@ -514,7 +514,6 @@ void Use_Plat (edict_t *ent, edict_t *other, edict_t *activator)
 
 void Touch_Plat_Center (edict_t *ent, edict_t *other, cplane_t *plane, csurface_t *surf)
 {
-	edict_t *trigger = ent;
 	if (!other->client)
 		return;
 

diff --git a/zaero/g_items.c b/zaero/g_items.c
@@ -21,11 +21,11 @@ gitem_armor_t jacketarmor_info	= { 25,  50, .30, .00, ARMOR_JACKET};
 gitem_armor_t combatarmor_info	= { 50, 100, .60, .30, ARMOR_COMBAT};
 gitem_armor_t bodyarmor_info	= {100, 200, .80, .60, ARMOR_BODY};
 
-static int	jacket_armor_index;
-static int	combat_armor_index;
-static int	body_armor_index;
-static int	power_screen_index;
-static int	power_shield_index;
+int	jacket_armor_index;
+int	combat_armor_index;
+int	body_armor_index;
+int	power_screen_index;
+int	power_shield_index;
 
 #define HEALTH_IGNORE_MAX	1
 #define HEALTH_TIMED		2

diff --git a/zaero/g_local.h b/zaero/g_local.h
@@ -672,7 +672,7 @@ int PowerArmorType (edict_t *ent);
 gitem_t	*GetItemByIndex (int index);
 qboolean Add_Ammo (edict_t *ent, gitem_t *item, int count);
 void Touch_Item (edict_t *ent, edict_t *other, cplane_t *plane, csurface_t *surf);
-void precacheAllItems();
+void precacheAllItems(void);
 
 //
 // g_utils.c

diff --git a/zaero/g_phys.c b/zaero/g_phys.c
@@ -659,7 +659,7 @@ void SV_Physics_Toss (edict_t *ent)
 	qboolean	wasinwater;
 	qboolean	isinwater;
 	vec3_t		old_origin;
-  float speed;
+  float speed = 0.f;
 
 // regular thinking
 	SV_RunThink (ent);

diff --git a/zaero/g_save.c b/zaero/g_save.c
@@ -309,6 +309,8 @@ void WriteField2 (FILE *f, field_t *field, byte *base)
 			fwrite (*(char **)p, len, 1, f);
 		}
 		break;
+	default:
+		break;
 	}
 }
 

diff --git a/zaero/g_spawn.c b/zaero/g_spawn.c
@@ -421,6 +421,8 @@ void ED_ParseField (char *key, char *value, edict_t *ent)
 				break;
 			case F_IGNORE:
 				break;
+			default:
+				break;
 			}
 			return;
 		}
@@ -534,7 +536,7 @@ void G_FindTeams (void)
 	gi.dprintf ("%i teams with %i entities\n", c, c2);
 }
 
-void Z_SpawnDMItems();
+void Z_SpawnDMItems(void);
 
 /*
 ==============

diff --git a/zaero/m_boss31.c b/zaero/m_boss31.c
@@ -9,7 +9,7 @@ jorg
 #include "g_local.h"
 #include "m_boss31.h"
 
-extern SP_monster_makron (edict_t *self);
+extern void SP_monster_makron (edict_t *self);
 qboolean visible (edict_t *self, edict_t *other);
 
 static int	sound_pain1;

diff --git a/zaero/m_move.c b/zaero/m_move.c
@@ -444,7 +444,7 @@ void SV_NewChaseDir (edict_t *actor, edict_t *enemy, float dist)
 	}
 
 // try other directions
-	if ( ((rand()&3) & 1) ||  abs(deltay)>abs(deltax))
+	if ( ((rand()&3) & 1) ||  fabs(deltay)>fabs(deltax))
 	{
 		tdir=d[1];
 		d[1]=d[2];
@@ -612,4 +612,4 @@ qboolean M_MoveAwayFromFlare(edict_t *self, float dist)
 	G_FreeEdict(goal);
 
 	return true;
-}
+}
-Original file line number
+Diff line change
@@ Expand Up @@
     void Touch_Plat_Center (edict_t *ent, edict_t *other, cplane_t *plane, csurface_t *surf)
     {
-    	edict_t *trigger = ent;
     	if (!other->client)
     		return;
@@ Expand Down @@