|
From: <dar...@us...> - 2003-09-02 02:06:41
|
Update of /cvsroot/wpdev/wolfpack
In directory sc8-pr-cvs1:/tmp/cvs-serv17837
Modified Files:
Timing.cpp combat.cpp globals.cpp globals.h makemenus.cpp
prototypes.h structs.h tracking.cpp wolf.dsp wolfpack.cpp
wolfpack.pro wpdefmanager.cpp wpdefmanager.h
Log Message:
Removed init_sounds
Index: Timing.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/Timing.cpp,v
retrieving revision 1.176
retrieving revision 1.177
diff -C2 -d -r1.176 -r1.177
*** Timing.cpp 30 Aug 2003 21:30:05 -0000 1.176
--- Timing.cpp 2 Sep 2003 02:06:33 -0000 1.177
***************
*** 345,359 ****
}
*/
-
- if( SrvParams->bgSound() >= 1 )
- {
- timer = SrvParams->bgSound() * 100;
- if( timer == 0 )
- timer = 1;
-
- if( socket && !pc->isDead() && ( (rand()%(timer) ) == (timer/2)))
- bgsound( pc );
- }
-
/*
// Reset spirit-speak
--- 345,348 ----
Index: combat.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/combat.cpp,v
retrieving revision 1.144
retrieving revision 1.145
diff -C2 -d -r1.144 -r1.145
*** combat.cpp 28 Aug 2003 20:56:16 -0000 1.144
--- combat.cpp 2 Sep 2003 02:06:34 -0000 1.145
***************
*** 53,56 ****
--- 53,57 ----
#include "npc.h"
#include "chars.h"
+ #include "basedef.h"
#include "debug.h"
***************
*** 83,87 ****
if( !pChar->isHuman() )
{
! id = creatures[ pChar->bodyID() ].basesound + RandomNum( 0, 1 );
break;
}
--- 84,91 ----
if( !pChar->isHuman() )
{
! cCharBaseDef *def = BaseDefManager::instance()->getCharBaseDef( pChar->bodyID() );
!
! if( def != 0 )
! id = def->basesound() + RandomNum( 0, 1 );
break;
}
***************
*** 103,107 ****
}
! pChar->soundEffect( id );
}
--- 107,112 ----
}
! if( id != 0 )
! pChar->soundEffect( id );
}
***************
*** 1092,1096 ****
{
UINT8 action = 4 + RandomNum( 0, 2 ); // some creatures dont have animation #4
! if( creatures[id].who_am_i & 0x2 ) // anti blink bit set ?
{
action++;
--- 1097,1103 ----
{
UINT8 action = 4 + RandomNum( 0, 2 ); // some creatures dont have animation #4
! cCharBaseDef *def = BaseDefManager::instance()->getCharBaseDef( id );
!
! if( def && def->flags() & 0x2 ) // anti blink bit set ?
{
action++;
Index: globals.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/globals.cpp,v
retrieving revision 1.98
retrieving revision 1.99
diff -C2 -d -r1.98 -r1.99
*** globals.cpp 21 Aug 2003 05:04:35 -0000 1.98
--- globals.cpp 2 Sep 2003 02:06:34 -0000 1.99
***************
*** 54,61 ****
WPConsole_cl clConsole;
- unsigned short int doorbase[DOORTYPES]={
- 0x0675, 0x0685, 0x0695, 0x06A5, 0x06B5, 0x06C5, 0x06D5, 0x06E5, 0x0839, 0x084C,
- 0x0866, 0x00E8, 0x0314, 0x0324, 0x0334, 0x0344, 0x0354};
-
time_t oldtime, newtime;
--- 54,57 ----
***************
*** 139,147 ****
/// and the rest /
///////////////////////////////////////////
! creat_st creatures[2048];
!
! int npcshape[5]; //Stores the coords of the bouding shape for the NPC
!
! std::vector<std::string> clientsAllowed; // client version controll system
/////////////////////////////////////////
--- 135,139 ----
/// and the rest /
///////////////////////////////////////////
! std::vector<std::string> clientsAllowed; // client version controll system
/////////////////////////////////////////
Index: globals.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/globals.h,v
retrieving revision 1.72
retrieving revision 1.73
diff -C2 -d -r1.72 -r1.73
*** globals.h 21 Aug 2003 05:04:35 -0000 1.72
--- globals.h 2 Sep 2003 02:06:34 -0000 1.73
***************
*** 117,130 ****
/******************************************************/
- ///////////////////////////////////////////
- /// and the rest /
- ///////////////////////////////////////////
-
- extern unsigned short int doorbase[DOORTYPES];
-
- extern creat_st creatures[2048]; //LB, stores the base-sound+sound flags of monsters, animals
-
- extern int npcshape[5]; //Stores the coords of the bouding shape for the NPC
-
/////////////////////////////////////////
///////////// global string vars /////////
--- 117,120 ----
Index: makemenus.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/makemenus.cpp,v
retrieving revision 1.56
retrieving revision 1.57
diff -C2 -d -r1.56 -r1.57
*** makemenus.cpp 27 Aug 2003 21:43:57 -0000 1.56
--- makemenus.cpp 2 Sep 2003 02:06:34 -0000 1.57
***************
*** 39,42 ****
--- 39,43 ----
#include "srvparams.h"
#include "python/utilities.h"
+ #include "basedef.h"
#include "debug.h"
***************
*** 1084,1088 ****
else if( TagName == "bodymodel" )
! model_ = creatures[ Value.toUShort() ].icon;
}
--- 1085,1092 ----
else if( TagName == "bodymodel" )
! {
! cCharBaseDef *bdef = BaseDefManager::instance()->getCharBaseDef( Value.toUShort() );
! model_ = bdef != 0 ? bdef->shrinked() : 0;
! }
}
***************
*** 1954,1958 ****
{
// generate cMakeAction object for the npc definition...
! cMakeAction* pNpc = new cMakeAction( current, creatures[model].icon, description, cMakeAction::NPC_SECTION, currentBaseMenu );
if( pNpc )
{
--- 1958,1965 ----
{
// generate cMakeAction object for the npc definition...
! cCharBaseDef *bdef = BaseDefManager::instance()->getCharBaseDef( model );
! model = bdef != 0 ? bdef->shrinked() : 0;
!
! cMakeAction* pNpc = new cMakeAction( current, model, description, cMakeAction::NPC_SECTION, currentBaseMenu );
if( pNpc )
{
Index: prototypes.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/prototypes.h,v
retrieving revision 1.103
retrieving revision 1.104
diff -C2 -d -r1.103 -r1.104
*** prototypes.h 27 Aug 2003 21:43:57 -0000 1.103
--- prototypes.h 2 Sep 2003 02:06:34 -0000 1.104
***************
*** 46,50 ****
QString hex2dec( const QString& value );
- extern void init_creatures(void);
void showPaperdoll( cUOSocket *socket, P_CHAR pTarget, bool hotkey );
void savelog(const char *msg, char *logfile);
--- 46,49 ----
***************
*** 61,69 ****
void delequan(P_CHAR pc, short id, int amount, int *not_deleted = NULL);
void playmonstersound(P_CHAR monster, unsigned short id, int sfx);
- void sellaction(int s);
-
- void clearalltrades();
- void trademsg(int s);
- void dotrade(P_ITEM cont1, P_ITEM cont2);
bool inVisRange(int x1, int y1, int x2, int y2);
--- 60,63 ----
***************
*** 71,76 ****
int DeleBankItem( P_PLAYER pc, unsigned short itemid, unsigned short color, int amt );
void getSextantCords(signed int x, signed int y, bool t2a, char *sextant);
- void bgsound(P_CHAR pc);
- int hexnumber(int countx);
int lineOfSight( const Coord_cl&, const Coord_cl&, int checkfor );
void reloadScripts();
--- 65,68 ----
Index: structs.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/structs.h,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** structs.h 20 Aug 2003 19:46:01 -0000 1.35
--- structs.h 2 Sep 2003 02:06:34 -0000 1.36
***************
*** 64,76 ****
};
- struct creat_st
- {
- int basesound;
- unsigned char soundflag;
- unsigned char who_am_i;
- int icon;
- unsigned char type;
- };
-
struct location_st
{
--- 64,67 ----
Index: tracking.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/tracking.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** tracking.cpp 20 Aug 2003 17:10:48 -0000 1.16
--- tracking.cpp 2 Sep 2003 02:06:34 -0000 1.17
***************
*** 42,45 ****
--- 42,46 ----
#include "basechar.h"
#include "player.h"
+ #include "basedef.h"
class cRefreshTracking: public cTempEffect
***************
*** 164,168 ****
}
! addTilePic( (pAmount*100)+20, 20, creatures[ pChar->bodyID() ].icon );
addButton( (pAmount*100)+20, 110, 0xFA5, 0xFA7, pChar->serial() );
addCroppedText( (pAmount*100)+20, 90, 100, 40, pChar->name() );
--- 165,173 ----
}
! cCharBaseDef *def = BaseDefManager::instance()->getCharBaseDef( pChar->bodyID() );
!
! if( def && def->shrinked() != 0 )
! addTilePic( (pAmount*100)+20, 20, def->shrinked() );
!
addButton( (pAmount*100)+20, 110, 0xFA5, 0xFA7, pChar->serial() );
addCroppedText( (pAmount*100)+20, 90, 100, 40, pChar->name() );
Index: wolf.dsp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/wolf.dsp,v
retrieving revision 1.210
retrieving revision 1.211
diff -C2 -d -r1.210 -r1.211
*** wolf.dsp 1 Sep 2003 05:03:04 -0000 1.210
--- wolf.dsp 2 Sep 2003 02:06:34 -0000 1.211
***************
*** 1,23 ****
# Microsoft Developer Studio Project File - Name="wolf" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
! # ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Console Application" 0x0103
CFG=wolf - Win32 Debug
! !MESSAGE This is not a valid makefile. To build this project using NMAKE,
! !MESSAGE use the Export Makefile command and run
!MESSAGE
!MESSAGE NMAKE /f "wolf.mak".
!MESSAGE
! !MESSAGE You can specify a configuration when running NMAKE
! !MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
!MESSAGE NMAKE /f "wolf.mak" CFG="wolf - Win32 Debug"
!MESSAGE
! !MESSAGE Possible choices for configuration are:
!MESSAGE
! !MESSAGE "wolf - Win32 Release" (based on "Win32 (x86) Console Application")
! !MESSAGE "wolf - Win32 Debug" (based on "Win32 (x86) Console Application")
!MESSAGE
--- 1,23 ----
# Microsoft Developer Studio Project File - Name="wolf" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
! # ** NICHT BEARBEITEN **
# TARGTYPE "Win32 (x86) Console Application" 0x0103
CFG=wolf - Win32 Debug
! !MESSAGE Dies ist kein gültiges Makefile. Zum Erstellen dieses Projekts mit NMAKE
! !MESSAGE verwenden Sie den Befehl "Makefile exportieren" und führen Sie den Befehl
!MESSAGE
!MESSAGE NMAKE /f "wolf.mak".
!MESSAGE
! !MESSAGE Sie können beim Ausführen von NMAKE eine Konfiguration angeben
! !MESSAGE durch Definieren des Makros CFG in der Befehlszeile. Zum Beispiel:
!MESSAGE
!MESSAGE NMAKE /f "wolf.mak" CFG="wolf - Win32 Debug"
!MESSAGE
! !MESSAGE Für die Konfiguration stehen zur Auswahl:
!MESSAGE
! !MESSAGE "wolf - Win32 Release" (basierend auf "Win32 (x86) Console Application")
! !MESSAGE "wolf - Win32 Debug" (basierend auf "Win32 (x86) Console Application")
!MESSAGE
***************
*** 26,30 ****
# PROP Scc_ProjName "wolf"
# PROP Scc_LocalPath "."
! CPP=xicl6.exe
RSC=rc.exe
--- 26,30 ----
# PROP Scc_ProjName "wolf"
# PROP Scc_LocalPath "."
! CPP=cl.exe
RSC=rc.exe
***************
*** 50,54 ****
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
! LINK32=xilink6.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
# ADD LINK32 kernel32.lib user32.lib advapi32.lib ws2_32.lib $(QTDIR)\lib\qt-mt312.lib libmysql.lib /nologo /subsystem:console /map /machine:I386 /nodefaultlib:"libcmt MSVCRTD" /out:"D:\wolfpack\wolfpack.exe" /libpath:"lib\ZThread\lib" /libpath:"lib\Python\lib" /libpath:"lib\bugreport\lib" /libpath:"flatstore\Release" /opt:ref /opt:nowin98
--- 50,54 ----
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
! LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
# ADD LINK32 kernel32.lib user32.lib advapi32.lib ws2_32.lib $(QTDIR)\lib\qt-mt312.lib libmysql.lib /nologo /subsystem:console /map /machine:I386 /nodefaultlib:"libcmt MSVCRTD" /out:"D:\wolfpack\wolfpack.exe" /libpath:"lib\ZThread\lib" /libpath:"lib\Python\lib" /libpath:"lib\bugreport\lib" /libpath:"flatstore\Release" /opt:ref /opt:nowin98
***************
*** 75,81 ****
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
! LINK32=xilink6.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
! # ADD LINK32 kernel32.lib user32.lib advapi32.lib ws2_32.lib $(QTDIR)\lib\qt-mt320.lib libmysql.lib /nologo /version:12.9 /subsystem:console /map /debug /machine:I386 /out:"..\Wolfpack.exe" /pdbtype:sept /libpath:"lib\bugreport\lib" /libpath:"flatstore\Debug"
# SUBTRACT LINK32 /pdb:none
--- 75,81 ----
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
! LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
! # ADD LINK32 kernel32.lib user32.lib advapi32.lib ws2_32.lib $(QTDIR)\lib\qt-mt312.lib /nologo /version:12.9 /subsystem:console /map /debug /machine:I386 /out:"..\Wolfpack.exe" /pdbtype:sept /libpath:"lib\bugreport\lib" /libpath:"flatstore\Debug"
# SUBTRACT LINK32 /pdb:none
***************
*** 115,118 ****
--- 115,122 ----
# Begin Source File
+ SOURCE=.\basedef.cpp
+ # End Source File
+ # Begin Source File
+
SOURCE=.\basics.cpp
# End Source File
***************
*** 389,392 ****
--- 393,400 ----
SOURCE=.\basechar.h
# PROP Ignore_Default_Tool 1
+ # End Source File
+ # Begin Source File
+
+ SOURCE=.\basedef.h
# End Source File
# Begin Source File
Index: wolfpack.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/wolfpack.cpp,v
retrieving revision 1.447
retrieving revision 1.448
diff -C2 -d -r1.447 -r1.448
*** wolfpack.cpp 2 Sep 2003 01:07:44 -0000 1.447
--- wolfpack.cpp 2 Sep 2003 02:06:34 -0000 1.448
***************
*** 71,74 ****
--- 71,75 ----
#include "ai.h"
#include "sectors.h"
+ #include "basedef.h"
// Library Includes
***************
*** 766,771 ****
endtime = 0;
lclock = 0;
[...1174 lines suppressed...]
- case 2: basesound=288;break; // bigfoot 2
- case 3: basesound=639;break; // old snake sound
- case 4: basesound=179;break; // lion sound
- case 5: basesound=246;break; // mystic
- case 6: basesound=253;break; // mystic II
- }
-
- if (basesound !=0)
- {
- /*sfx[2] = (unsigned char) (basesound>>8);
- sfx[3] = (unsigned char) (basesound%256);
- sfx[6] = (unsigned char) (pc->pos().x>>8);
- sfx[7] = (unsigned char) (pc->pos().x%256);
- sfx[8] = (unsigned char) (pc->pos().y>>8);
- sfx[9] = (unsigned char) (pc->pos().y%256);
- Xsend(calcSocketFromChar(pc), sfx, 12); //bugfix LB*/
- }
}
}
--- 1149,1152 ----
Index: wolfpack.pro
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/wolfpack.pro,v
retrieving revision 1.143
retrieving revision 1.144
diff -C2 -d -r1.143 -r1.144
*** wolfpack.pro 2 Sep 2003 01:27:57 -0000 1.143
--- wolfpack.pro 2 Sep 2003 02:06:34 -0000 1.144
***************
*** 59,62 ****
--- 59,63 ----
basics.h \
basechar.h \
+ basedef.h \
boats.h \
coord.h \
***************
*** 126,129 ****
--- 127,131 ----
ai_vendors.cpp \
basechar.cpp \
+ basedef.cpp \
basics.cpp \
boats.cpp \
Index: wpdefmanager.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/wpdefmanager.cpp,v
retrieving revision 1.59
retrieving revision 1.60
diff -C2 -d -r1.59 -r1.60
*** wpdefmanager.cpp 20 Jul 2003 00:04:51 -0000 1.59
--- wpdefmanager.cpp 2 Sep 2003 02:06:34 -0000 1.60
***************
*** 38,41 ****
--- 38,42 ----
#include "commands.h"
#include "encryption.h"
+ #include "basedef.h"
// Library Includes
***************
*** 79,82 ****
--- 80,84 ----
{ "contextmenu", WPDT_CONTEXTMENU },
{ "ai", WPDT_AI },
+ { "charbase", WPDT_CHARBASE },
{ 0, WPDT_COUNT },
};
***************
*** 263,266 ****
--- 265,270 ----
impl->imports.clear();
+
+ BaseDefManager::instance()->unload();
}
***************
*** 289,292 ****
--- 293,297 ----
cCommands::instance()->loadACLs();
+ BaseDefManager::instance()->load();
}
Index: wpdefmanager.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/wpdefmanager.h,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** wpdefmanager.h 20 Jul 2003 00:04:51 -0000 1.30
--- wpdefmanager.h 2 Sep 2003 02:06:34 -0000 1.31
***************
*** 71,74 ****
--- 71,75 ----
WPDT_CONTEXTMENU,
WPDT_AI,
+ WPDT_CHARBASE,
WPDT_COUNT
};
|
