[TeamTalk 117]: [654] usarsim: 1) Fixed some make issues for USARSim

[tk@edam.speech.cs.cmu.edu]

An HTML attachment was scrubbed...
URL: http://mailman.srv.cs.cmu.edu/pipermail/teamtalk-developers/attachments/20070711/ea202032/attachment.html
-------------- next part --------------
Modified: usarsim/System/Makefile
===================================================================
--- usarsim/System/Makefile	2007-07-12 01:39:36 UTC (rev 653)
+++ usarsim/System/Makefile	2007-07-12 03:33:49 UTC (rev 654)
@@ -1,34 +1,46 @@
-LINUX_DIR=../../ut2004-linux/
+INSTALL_DIR=../../ut2004-linux
 
-MAPS=$(LINUX_DIR)/Maps/DM-RoboticsLab_250.ut2
+PACKAGES=USARBotAPI.u USARBot.u USARMisPkg.u USARModels.u USARVictims.u \
+         TreasureHunt.u
 
-PACKAGES=$(LINUX_DIR)/System/USARBotAPI.u \
-         $(LINUX_DIR)/System/USARBot.u \
-         $(LINUX_DIR)/System/USARMisPkg.u \
-         $(LINUX_DIR)/System/USARModels.u \
-         $(LINUX_DIR)/System/USARVictims.u \
-         $(LINUX_DIR)/System/TreasureHunt.u
+INSTALL_MAPS=$(INSTALL_DIR)/Maps/DM-RoboticsLab_250.ut2
 
-INIS=$(LINUX_DIR)/System/USARSim.ini
+INSTALL_PACKAGES=$(INSTALL_DIR)/System/USARBotAPI.u \
+                 $(INSTALL_DIR)/System/USARBot.u \
+                 $(INSTALL_DIR)/System/USARMisPkg.u \
+                 $(INSTALL_DIR)/System/USARModels.u \
+                 $(INSTALL_DIR)/System/USARVictims.u \
+                 $(INSTALL_DIR)/System/TreasureHunt.u
 
-BATCH=$(LINUX_DIR)/System/usar_sx.sh
+INSTALL_INIS=$(INSTALL_DIR)/System/USARSim.ini
 
-all: ucc $(MAPS) $(PACKAGES) $(INIS) $(BATCH)
+INSTALL_BATCH=$(INSTALL_DIR)/System/usar_sx.sh
 
+all: $(PACKAGES) ucc
+
+install: $(INSTALL_MAPS) $(INSTALL_PACKAGES) $(INSTALL_INIS) $(INSTALL_BATCH) 
+
+$(INSTALL_DIR)/%:../%
+	cp -f $< $@
+
 ucc:
 	wine UCC.exe make -ini=USARSim.ini
 
-$(LINUX_DIR)/Maps/%.ut2:../Maps/%.ut2
-	cp -f $< $@
+USARBotAPI.u:../USARBotAPI/Classes/*.uc
+	rm -f $@
 
-$(LINUX_DIR)/System/%.u:%.u
-	cp -f $< $@
+USARBot.u:../USARBot/Classes/*.uc
+	rm -f $@
 
-$(LINUX_DIR)/System/%.ini:%.ini
-	cp -f $< $@
+USARMisPkg.u:../USARMisPkg/Classes/*.uc
+	rm -f $@
 
-$(LINUX_DIR)/System/%.sh:%.sh
-	cp -f $< $@
+USARModels.u:../USARModels/Classes/*.uc
+	rm -f $@
 
+USARVictims.u:../USARVictims/Classes/*.uc
+	rm -f $@
 
+TreasureHunt.u:../TreasureHunt/Classes/*.uc
+	rm -f $@
 

Added: usarsim/TreasureHunt/Classes/FemaleTreasureHunterPawn.uc
===================================================================
--- usarsim/TreasureHunt/Classes/FemaleTreasureHunterPawn.uc	                        (rev 0)
+++ usarsim/TreasureHunt/Classes/FemaleTreasureHunterPawn.uc	2007-07-12 03:33:49 UTC (rev 654)
@@ -0,0 +1,10 @@
+Class FemaleTreasureHunterPawn extends TreasureHunterPawn;
+
+defaultproperties
+{
+    // Size of all female hunters is the same
+    DrawScale=1.65
+
+    // Animation subset
+    Mesh=SkeletalMesh'UDN_CharacterModels_K.GenericFemale'
+}
\ No newline at end of file

Added: usarsim/TreasureHunt/Classes/MaleTreasureHunterPawn.uc
===================================================================
--- usarsim/TreasureHunt/Classes/MaleTreasureHunterPawn.uc	                        (rev 0)
+++ usarsim/TreasureHunt/Classes/MaleTreasureHunterPawn.uc	2007-07-12 03:33:49 UTC (rev 654)
@@ -0,0 +1,21 @@
+Class MaleTreasureHunterPawn extends TreasureHunterPawn;
+
+defaultproperties
+{
+    // Size of all male hunter is the same
+    DrawScale=1.8
+
+    // Animation subset
+    Mesh=SkeletalMesh'UDN_CharacterModels_K.GenericMale'
+
+    BaseEyeHeight=+00150.000000
+    EyeHeight=+00150.000000
+    CollisionRadius=+00061.200000
+    CollisionHeight=+00203.000000
+    CrouchHeight=+00070.200000
+    CrouchRadius=+00061.200000
+    GroundSpeed=+00800.000000
+    AirSpeed=+00800.000000
+    WaterSpeed=+00400.000000
+    JumpZ=+00630.000000
+}
\ No newline at end of file

Modified: usarsim/TreasureHunt/Classes/TreasureHuntGame.uc
===================================================================
--- usarsim/TreasureHunt/Classes/TreasureHuntGame.uc	2007-07-12 01:39:36 UTC (rev 653)
+++ usarsim/TreasureHunt/Classes/TreasureHuntGame.uc	2007-07-12 03:33:49 UTC (rev 654)
@@ -19,8 +19,6 @@
 	return;
     }
 
-    log("RESTARTSOMETHING"@aPlayer);
-
     if( bRestartLevel && Level.NetMode!=NM_DedicatedServer && Level.NetMode!=NM_ListenServer )
         return;
 
@@ -39,12 +37,15 @@
     if (aPlayer.PreviousPawnClass!=None && aPlayer.PawnClass != aPlayer.PreviousPawnClass)
         BaseMutator.PlayerChangedClass(aPlayer);
 
-    if ( aPlayer.PawnClass != None )
+    if ( aPlayer.PawnClass != None && aPlayer.PawnClass.IsA('TreasureHunterPawn'))
         aPlayer.Pawn = Spawn(aPlayer.PawnClass,,,StartSpot.Location,StartSpot.Rotation);
 
     if( aPlayer.Pawn==None )
     {
-        DefaultPlayerClass = GetDefaultPlayerClass(aPlayer);
+	//we may revert back to this once we speciallize the controller
+        //DefaultPlayerClass = GetDefaultPlayerClass(aPlayer);
+        //for now hardcode here
+        DefaultPlayerClass = class'MaleTreasureHunterPawn';
         aPlayer.Pawn = Spawn(DefaultPlayerClass,,,StartSpot.Location,StartSpot.Rotation);
     }
     if ( aPlayer.Pawn == None )

Added: usarsim/TreasureHunt/Classes/TreasureHunterPawn.uc
===================================================================
--- usarsim/TreasureHunt/Classes/TreasureHunterPawn.uc	                        (rev 0)
+++ usarsim/TreasureHunt/Classes/TreasureHunterPawn.uc	2007-07-12 03:33:49 UTC (rev 654)
@@ -0,0 +1,5 @@
+Class TreasureHunterPawn extends UnrealPawn;
+
+defaultproperties
+{
+}
\ No newline at end of file