[Opentnl-cvs] tnl/zap HTFGame.cpp,NONE,1.1 ZAP.vcproj,1.38,1.39 game.h,1.63,1.64 main.cpp,1.68,1.69 ship.cpp,1.75,1.76

[Mark F. <mar...@us...>]

Update of /cvsroot/opentnl/tnl/zap
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8489/zap

Modified Files:
	ZAP.vcproj game.h main.cpp ship.cpp 
Added Files:
	HTFGame.cpp 
Log Message:
Added new game type
Updated game version

Index: main.cpp
===================================================================
RCS file: /cvsroot/opentnl/tnl/zap/main.cpp,v
retrieving revision 1.68
retrieving revision 1.69
diff -C2 -d -r1.68 -r1.69
*** main.cpp	20 Aug 2004 23:16:07 -0000	1.68
--- main.cpp	17 Sep 2004 00:14:34 -0000	1.69
***************
*** 70,74 ****
  const char *gLevelList = "retrieve1.txt "
                           "retrieve2.txt "
!                          "retrieve3.txt "
                           "football1.txt "
                           "football2.txt "
--- 70,74 ----
  const char *gLevelList = "retrieve1.txt "
                           "retrieve2.txt "
!                          "htf1.txt "
                           "football1.txt "
                           "football2.txt "
***************
*** 83,88 ****
                           "ctf3.txt "
                           "ctf4.txt "
!                          "level8.txt "
!                          "level2.txt "
                           ;
  
--- 83,89 ----
                           "ctf3.txt "
                           "ctf4.txt "
!                          "hunters1.txt "
!                          "hunters2.txt "
!                          "zm1.txt "
                           ;
  

Index: ZAP.vcproj
===================================================================
RCS file: /cvsroot/opentnl/tnl/zap/ZAP.vcproj,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -d -r1.38 -r1.39
*** ZAP.vcproj	24 Aug 2004 22:08:39 -0000	1.38
--- ZAP.vcproj	17 Sep 2004 00:14:34 -0000	1.39
***************
*** 377,380 ****
--- 377,383 ----
  			</File>
  			<File
+ 				RelativePath=".\HTFGame.cpp">
+ 			</File>
+ 			<File
  				RelativePath=".\huntersGame.cpp">
  			</File>

Index: game.h
===================================================================
RCS file: /cvsroot/opentnl/tnl/zap/game.h,v
retrieving revision 1.63
retrieving revision 1.64
diff -C2 -d -r1.63 -r1.64
*** game.h	20 Aug 2004 23:16:07 -0000	1.63
--- game.h	17 Sep 2004 00:14:34 -0000	1.64
***************
*** 234,238 ****
  extern void endGame();
  
! #define ZAP_GAME_STRING "ZAP 1.4.1"
  };
  
--- 234,238 ----
  extern void endGame();
  
! #define ZAP_GAME_STRING "ZAP 1.4.2"
  };
  

--- NEW FILE: HTFGame.cpp ---
//-----------------------------------------------------------------------------------
//
//   Torque Network Library - ZAP example multiplayer vector graphics space game
//   Copyright (C) 2004 GarageGames.com, Inc.
//   For more information see http://www.opentnl.org
//
//   This program is free software; you can redistribute it and/or modify
//   it under the terms of the GNU General Public License as published by
//   the Free Software Foundation; either version 2 of the License, or
//   (at your option) any later version.
//
//   For use in products that are not compatible with the terms of the GNU 
//   General Public License, alternative licensing options are available 
//   from GarageGames.com.
//
//   This program is distributed in the hope that it will be useful,
//   but WITHOUT ANY WARRANTY; without even the implied warranty of
//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
//   GNU General Public License for more details.
//
//   You should have received a copy of the GNU General Public License
//   along with this program; if not, write to the Free Software
//   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
//
//------------------------------------------------------------------------------------

#include "goalZone.h"
#include "gameType.h"
#include "ship.h"
#include "flagItem.h"
#include "gameObjectRender.h"

namespace Zap
{

class HTFGameType : public GameType
{
   typedef GameType Parent;
   static StringTableEntry aString;
   static StringTableEntry theString;

   Vector<GoalZone *> mZones;
   Vector<FlagItem *> mFlags;
   Vector<GoalZone *> mFlagZones;
   enum {
      CapScore = 2,
      ScoreTime = 5000,
   };
   Timer mScoreTimer;
public:
   HTFGameType() : mScoreTimer(ScoreTime) {}
   void addFlag(FlagItem *theFlag)
   {
      mFlags.push_back(theFlag);
      mFlagZones.push_back(NULL);
   }

   void addZone(GoalZone *zone)
   {
      mZones.push_back(zone);
   }

   void shipTouchFlag(Ship *theShip, FlagItem *theFlag)
   {
      // see if the ship is already carrying a flag - can only carry one at a time
      for(S32 i = 0; i < theShip->mMountedItems.size(); i++)
         if(theShip->mMountedItems[i].isValid() && (theShip->mMountedItems[i]->getObjectTypeMask() & FlagType))
            return;

      S32 flagIndex;

      for(flagIndex = 0; flagIndex < mFlags.size(); flagIndex++)
         if(mFlags[flagIndex] == theFlag)
            break;

      GameConnection *controlConnection = theShip->getControllingClient();
      ClientRef *cl = controlConnection->getClientRef();
      if(!cl)
         return;

      // see if this flag is already in a flag zone owned by the ship's team
      if(mFlagZones[flagIndex] != NULL && mFlagZones[flagIndex]->getTeam() == theShip->getTeam())
         return;

      static StringTableEntry stealString("%e0 stole %e2 flag from team %e1!");
      static StringTableEntry takeString("%e0 of team %e1 took %e2 flag!");
      StringTableEntry r = takeString;
      S32 teamIndex;

      if(mFlagZones[flagIndex] == NULL)
         teamIndex = cl->teamId;
      else
      {
         r = stealString;
         teamIndex = mFlagZones[flagIndex]->getTeam();
      }
      Vector<StringTableEntry> e;
      e.push_back(cl->name);
      e.push_back(mTeams[teamIndex].name);

      if(mFlags.size() == 1)
         e.push_back(theString);
      else
         e.push_back(aString);

      for(S32 i = 0; i < mClientList.size(); i++)
         mClientList[i]->clientConnection->s2cDisplayMessageE(
         GameConnection::ColorNuclearGreen, SFXFlagSnatch, r, e);
      theFlag->mountToShip(theShip);
      mFlagZones[flagIndex] = NULL;
   }

   void flagDropped(Ship *theShip, FlagItem *theFlag)
   {
      static StringTableEntry aString("a");
      static StringTableEntry theString("the");
      static StringTableEntry dropString("%e0 dropped %e1 flag!");
      Vector<StringTableEntry> e;
      e.push_back(theShip->mPlayerName);
      if(mFlags.size() == 1)
         e.push_back(theString);
      else
         e.push_back(aString);
      
      for(S32 i = 0; i < mClientList.size(); i++)
         mClientList[i]->clientConnection->s2cDisplayMessageE(GameConnection::ColorNuclearGreen, SFXFlagDrop, dropString, e);
   }

   void shipTouchZone(Ship *s, GoalZone *z)
   {
      GameConnection *controlConnection = s->getControllingClient();
      ClientRef *cl = controlConnection->getClientRef();

      if(!cl)
         return;

      // see if this is an opposing team's zone
      if(s->getTeam() != z->getTeam())
         return;

      // see if this zone already has a flag in it...
      for(S32 i = 0; i < mFlagZones.size(); i++)
         if(mFlagZones[i] == z)
            return;

      // ok, it's an empty zone on our team:
      // see if this ship is carrying a flag
      S32 i;
      for(i = 0; i < s->mMountedItems.size(); i++)
         if(s->mMountedItems[i].isValid() && (s->mMountedItems[i]->getObjectTypeMask() & FlagType))
            break;
      if(i == s->mMountedItems.size())
         return;

      // ok, the ship has a flag and it's on the ship...
      Item *theItem = s->mMountedItems[i];
      FlagItem *mountedFlag = dynamic_cast<FlagItem *>(theItem);
      if(mountedFlag)
      {
         static StringTableEntry capString("%e0 retrieved %e1 flag!");

         Vector<StringTableEntry> e;
         e.push_back(cl->name);
         if(mFlags.size() == 1)
            e.push_back(theString);
         else
            e.push_back(aString);

         for(S32 i = 0; i < mClientList.size(); i++)
            mClientList[i]->clientConnection->s2cDisplayMessageE(GameConnection::ColorNuclearGreen, 
            SFXFlagCapture, capString, e);

         mountedFlag->dismount();

         S32 flagIndex;
         for(flagIndex = 0; flagIndex < mFlags.size(); flagIndex++)
            if(mFlags[flagIndex] == mountedFlag)
               break;

         mFlagZones[flagIndex] = z;

         mountedFlag->setActualPos(z->getExtent().getCenter());
         cl->score += CapScore;
      }
   }

   void idle(GameObject::IdleCallPath path)
   {
      Parent::idle(path);
      if(path == GameObject::ServerIdleMainLoop)
      {
         if(!mScoreTimer.update(mCurrentMove.time))
            return;
         mScoreTimer.reset();
         for(S32 flagIndex = 0; flagIndex < mFlags.size(); flagIndex++)
         {
            if(mFlagZones[flagIndex] != NULL)
            {
               S32 team = mFlagZones[flagIndex]->getTeam();
               setTeamScore(team, mTeams[team].score + 1);
            }
         }
      }
   }

   const char *getGameTypeString() { return "Hold the Flag"; }
   const char *getInstructionString() { return "Hold the flags at your capture zones!"; }
   TNL_DECLARE_CLASS(HTFGameType);
};

StringTableEntry HTFGameType::aString("a");
StringTableEntry HTFGameType::theString("the");

TNL_IMPLEMENT_NETOBJECT(HTFGameType);


};
Index: ship.cpp
===================================================================
RCS file: /cvsroot/opentnl/tnl/zap/ship.cpp,v
retrieving revision 1.75
retrieving revision 1.76
diff -C2 -d -r1.75 -r1.76
*** ship.cpp	4 Aug 2004 18:25:27 -0000	1.75
--- ship.cpp	17 Sep 2004 00:14:34 -0000	1.76
***************
*** 133,136 ****
--- 133,137 ----
     F32 time = mCurrentMove.time * 0.001;
     Point requestVel(mCurrentMove.right - mCurrentMove.left, mCurrentMove.down - mCurrentMove.up);
+ 
     requestVel *= maxVel;
     F32 len = requestVel.len();