YGGverse/hlsdk-portable
1
0
Fork 0
mirror of https://github.com/YGGverse/hlsdk-portable.git synced 2025-08-26 05:42:00 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into gravgun

Browse Source
This commit is contained in:
mittorn 2017-02-01 14:45:12 +00:00
commit a06b307be5
25 changed files with 1881 additions and 1867 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
backup.bat
View File

@ -1,31 +1,31 @@
@echo off @echo off
color 4F color 4F
echo XashXT Group 2006 (C) echo XashXT Group 2006 (C)
echo Prepare source for backup echo Prepare source for backup
echo. echo.
if exist backup.log del /f /q backup.log if exist backup.log del /f /q backup.log
if not exist D:\!backup/ mkdir D:\!backup\ if not exist D:\!backup/ mkdir D:\!backup\
echo Prepare OK! echo Prepare OK!
echo Please wait: backup in progress echo Please wait: backup in progress
C:\Progra~1\WinRar\rar a -agMMMYYYY-DD D:\!backup\.rar -dh -m5 @backup.lst >>backup.log C:\Progra~1\WinRar\rar a -agMMMYYYY-DD D:\!backup\.rar -dh -m5 @backup.lst >>backup.log
if errorlevel 1 goto error if errorlevel 1 goto error
if errorlevel 0 goto ok if errorlevel 0 goto ok
:ok :ok
cls cls
echo Source was sucessfully backuped echo Source was sucessfully backuped
echo and stored in folder "backup" echo and stored in folder "backup"
echo Press any key for exit. :-) echo Press any key for exit. :-)
if exist backup.log del /f /q backup.log if exist backup.log del /f /q backup.log
exit exit
:error :error
echo ****************************** echo ******************************
echo ***********Error!************* echo ***********Error!*************
echo ****************************** echo ******************************
echo **See backup.log for details** echo **See backup.log for details**
echo ****************************** echo ******************************
echo ****************************** echo ******************************
echo. echo.
echo press any key for exit :-( echo press any key for exit :-(
pause>nul pause>nul
exit exit

70
backup.lst
View File

@ -1,36 +1,36 @@
//======================================================================= //=======================================================================
// Copyright XashXT Group 2007 © // Copyright XashXT Group 2007 ©
// list with backup directories // list with backup directories
//======================================================================= //=======================================================================
// global stuff // global stuff
xash.dsw xash.dsw
debug.bat debug.bat
backup.lst backup.lst
backup.bat backup.bat
release.bat release.bat
change.log change.log
make_sdk.bat make_sdk.bat
xash_sdk.lst xash_sdk.lst
cl_dll\ cl_dll\
cl_dll\hl\ cl_dll\hl\
common\ common\
dlls\ dlls\
game_shared\ game_shared\
game_launch\ game_launch\
engine\ engine\
engine\client\ engine\client\
engine\client\vgui\ engine\client\vgui\
engine\server\ engine\server\
engine\common\ engine\common\
engine\common\imagelib\ engine\common\imagelib\
engine\common\soundlib\ engine\common\soundlib\
pm_shared\ pm_shared\
mainui\ mainui\
mainui\legacy mainui\legacy
utils\ utils\
utils\makefont\ utils\makefont\
utils\vgui\ utils\vgui\
utils\vgui\include\ utils\vgui\include\
utils\vgui\lib\win32_vc6\ utils\vgui\lib\win32_vc6\

2
cl_dll/Android.mk
View File

@ -91,7 +91,7 @@ SRCS+=./input_xash3d.cpp
SRCS+=./scoreboard.cpp SRCS+=./scoreboard.cpp
SRCS+=./MOTD.cpp SRCS+=./MOTD.cpp
INCLUDES = -I../common -I. -I../game_shared -I../pm_shared -I../engine -I../dlls INCLUDES = -I../common -I. -I../game_shared -I../pm_shared -I../engine -I../dlls
DEFINES = -Wextra -Wno-missing-field-initializers -Wno-write-strings -DLINUX -D_LINUX -Dstricmp=strcasecmp -D_strnicmp=strncasecmp -Dstrnicmp=strncasecmp -DCLIENT_WEAPONS -DCLIENT_DLL DEFINES = -Wno-write-strings -DLINUX -D_LINUX -Dstricmp=strcasecmp -D_strnicmp=strncasecmp -Dstrnicmp=strncasecmp -DCLIENT_WEAPONS -DCLIENT_DLL -w
LOCAL_C_INCLUDES := $(LOCAL_PATH)/. \ LOCAL_C_INCLUDES := $(LOCAL_PATH)/. \
$(LOCAL_PATH)/../common \ $(LOCAL_PATH)/../common \

4
cl_dll/CMakeLists.txt
View File

@ -25,7 +25,7 @@ project (CLDLL)
set (CLDLL_LIBRARY client) set (CLDLL_LIBRARY client)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-write-strings -w") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-write-strings -DLINUX -D_LINUX -Dstricmp=strcasecmp -D_strnicmp=strncasecmp -Dstrnicmp=strncasecmp -DCLIENT_WEAPONS -DCLIENT_DLL -w")
set(CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS}") set(CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS}")
set (CLDLL_SOURCES set (CLDLL_SOURCES
@ -93,8 +93,6 @@ set (CLDLL_SOURCES
MOTD.cpp) MOTD.cpp)
include_directories (. hl/ ../dlls ../dlls/wpn_shared ../common ../engine ../pm_shared ../game_shared ../public) include_directories (. hl/ ../dlls ../dlls/wpn_shared ../common ../engine ../pm_shared ../game_shared ../public)
add_definitions( -DLINUX -D_LINUX -Dstricmp=strcasecmp -D_strnicmp=strncasecmp -Dstrnicmp=strncasecmp -DCLIENT_WEAPONS -DCLIENT_DLL )
if(USE_VOICEMGR) if(USE_VOICEMGR)
#set(CLDLL_SOURCES #set(CLDLL_SOURCES
# ${CLDLL_SOURCES} # ${CLDLL_SOURCES}

2
cl_dll/MOTD.cpp
View File

@ -130,7 +130,7 @@ int CHudMOTD::MsgFunc_MOTD( const char *pszName, int iSize, void *pbuf )
BEGIN_READ( pbuf, iSize ); BEGIN_READ( pbuf, iSize );
int is_finished = READ_BYTE(); int is_finished = READ_BYTE();
strncat( m_szMOTD, READ_STRING(), sizeof(m_szMOTD) - 1 ); strncat( m_szMOTD, READ_STRING(), sizeof(m_szMOTD) );
if( is_finished ) if( is_finished )
{ {

4
cl_dll/hl/hl_weapons.cpp
View File

@ -288,7 +288,7 @@ Only produces random numbers to match the server ones.
*/ */
Vector CBaseEntity::FireBulletsPlayer ( ULONG cShots, Vector vecSrc, Vector vecDirShooting, Vector vecSpread, float flDistance, int iBulletType, int iTracerFreq, int iDamage, entvars_t *pevAttacker, int shared_rand ) Vector CBaseEntity::FireBulletsPlayer ( ULONG cShots, Vector vecSrc, Vector vecDirShooting, Vector vecSpread, float flDistance, int iBulletType, int iTracerFreq, int iDamage, entvars_t *pevAttacker, int shared_rand )
{ {
float x = 0, y = 0, z; float x, y, z;
for( ULONG iShot = 1; iShot <= cShots; iShot++ ) for( ULONG iShot = 1; iShot <= cShots; iShot++ )
{ {
@ -576,7 +576,7 @@ void CBasePlayerWeapon::PrintState( void )
COM_Log( "c:\\hl.log", "%i ", m_iClip ); COM_Log( "c:\\hl.log", "%i ", m_iClip );
} }
long int RandomLong( long int a, long int b ) int RandomLong( int a, int b )
{ {
return gEngfuncs.pfnRandomLong( a, b ); return gEngfuncs.pfnRandomLong( a, b );
} }

2
cl_dll/hud.cpp
View File

@ -299,7 +299,6 @@ void CHud::VidInit( void )
if( m_pSpriteList ) if( m_pSpriteList )
{ {
int j;
// count the number of sprites of the appropriate res // count the number of sprites of the appropriate res
m_iSpriteCount = 0; m_iSpriteCount = 0;
client_sprite_t *p = m_pSpriteList; client_sprite_t *p = m_pSpriteList;
@ -336,7 +335,6 @@ void CHud::VidInit( void )
} }
else else
{ {
int j;
// we have already have loaded the sprite reference from hud.txt, but // we have already have loaded the sprite reference from hud.txt, but
// we need to make sure all the sprites have been loaded (we've gone through a transition, or loaded a save game) // we need to make sure all the sprites have been loaded (we've gone through a transition, or loaded a save game)
client_sprite_t *p = m_pSpriteList; client_sprite_t *p = m_pSpriteList;

2
cl_dll/message.cpp
View File

@ -310,7 +310,7 @@ int CHudMessage::Draw( float fTime )
{ {
int i, drawn; int i, drawn;
client_textmessage_t *pMessage; client_textmessage_t *pMessage;
float endTime = 0; float endTime;
drawn = 0; drawn = 0;

214
cl_dll/readme.txt
View File

@ -1,107 +1,107 @@
client dll readme.txt client dll readme.txt
------------------------- -------------------------
This file details the structure of the half-life client dll, and This file details the structure of the half-life client dll, and
how it communicates with the half-life game engine. how it communicates with the half-life game engine.
Engine callback functions: Engine callback functions:
Drawing functions: Drawing functions:
HSPRITE SPR_Load( char *picname ); HSPRITE SPR_Load( char *picname );
Loads a sprite into memory, and returns a handle to it. Loads a sprite into memory, and returns a handle to it.
int SPR_Frames( HSPRITE sprite ); int SPR_Frames( HSPRITE sprite );
Returns the number of frames stored in the specified sprite. Returns the number of frames stored in the specified sprite.
int SPR_Height( HSPRITE x, int frame ) int SPR_Height( HSPRITE x, int frame )
Returns the height, in pixels, of a sprite at the specified frame. Returns the height, in pixels, of a sprite at the specified frame.
Returns 0 is the frame number or the sprite handle is invalid. Returns 0 is the frame number or the sprite handle is invalid.
int SPR_Width( HSPRITE x, int f ) int SPR_Width( HSPRITE x, int f )
Returns the width, in pixels, of a sprite at the specified frame. Returns the width, in pixels, of a sprite at the specified frame.
Returns 0 is the frame number or the sprite handle is invalid. Returns 0 is the frame number or the sprite handle is invalid.
int SPR_Set( HSPRITE sprite, int r, int g, int b ); int SPR_Set( HSPRITE sprite, int r, int g, int b );
Prepares a sprite about to be drawn. RBG color values are applied to the sprite at this time. Prepares a sprite about to be drawn. RBG color values are applied to the sprite at this time.
void SPR_Draw( int frame, int x, int y ); void SPR_Draw( int frame, int x, int y );
Precondition: SPR_Set has already been called for a sprite. Precondition: SPR_Set has already been called for a sprite.
Draws the currently active sprite to the screen, at position (x,y), where (0,0) is Draws the currently active sprite to the screen, at position (x,y), where (0,0) is
the top left-hand corner of the screen. the top left-hand corner of the screen.
void SPR_DrawHoles( int frame, int x, int y ); void SPR_DrawHoles( int frame, int x, int y );
Precondition: SPR_Set has already been called for a sprite. Precondition: SPR_Set has already been called for a sprite.
Draws the currently active sprite to the screen. Color index #255 is treated as transparent. Draws the currently active sprite to the screen. Color index #255 is treated as transparent.
void SPR_DrawAdditive( int frame, int x, int y ); void SPR_DrawAdditive( int frame, int x, int y );
Precondition: SPR_Set has already been called for a sprite. Precondition: SPR_Set has already been called for a sprite.
Draws the currently active sprite to the screen, adding it's color values to the background. Draws the currently active sprite to the screen, adding it's color values to the background.
void SPR_EnableScissor( int x, int y, int width, int height ); void SPR_EnableScissor( int x, int y, int width, int height );
Creates a clipping rectangle. No pixels will be drawn outside the specified area. Will Creates a clipping rectangle. No pixels will be drawn outside the specified area. Will
stay in effect until either the next frame, or SPR_DisableScissor is called. stay in effect until either the next frame, or SPR_DisableScissor is called.
void SPR_DisableScissor( void ); void SPR_DisableScissor( void );
Disables the effect of an SPR_EnableScissor call. Disables the effect of an SPR_EnableScissor call.
int IsHighRes( void ); int IsHighRes( void );
returns 1 if the res mode is 640x480 or higher; 0 otherwise. returns 1 if the res mode is 640x480 or higher; 0 otherwise.
int ScreenWidth( void ); int ScreenWidth( void );
returns the screen width, in pixels. returns the screen width, in pixels.
int ScreenHeight( void ); int ScreenHeight( void );
returns the screen height, in pixels. returns the screen height, in pixels.
// Sound functions // Sound functions
void PlaySound( char *szSound, int volume ) void PlaySound( char *szSound, int volume )
plays the sound 'szSound' at the specified volume. Loads the sound if it hasn't been cached. plays the sound 'szSound' at the specified volume. Loads the sound if it hasn't been cached.
If it can't find the sound, it displays an error message and plays no sound. If it can't find the sound, it displays an error message and plays no sound.
void PlaySound( int iSound, int volume ) void PlaySound( int iSound, int volume )
Precondition: iSound has been precached. Precondition: iSound has been precached.
Plays the sound, from the precache list. Plays the sound, from the precache list.
// Communication functions // Communication functions
void SendClientCmd( char *szCmdString ); void SendClientCmd( char *szCmdString );
sends a command to the server, just as if the client had typed the szCmdString at the console. sends a command to the server, just as if the client had typed the szCmdString at the console.
char *GetPlayerName( int entity_number ); char *GetPlayerName( int entity_number );
returns a pointer to a string, that contains the name of the specified client. returns a pointer to a string, that contains the name of the specified client.
Returns NULL if the entity_number is not a client. Returns NULL if the entity_number is not a client.
DECLARE_MESSAGE(), HOOK_MESSAGE() DECLARE_MESSAGE(), HOOK_MESSAGE()
These two macros bind the message sending between the entity DLL and the client DLL to These two macros bind the message sending between the entity DLL and the client DLL to
the CHud object. the CHud object.
HOOK_MESSAGE( message_name ) HOOK_MESSAGE( message_name )
This is used inside CHud::Init(). It calls into the engine to hook that message This is used inside CHud::Init(). It calls into the engine to hook that message
from the incoming message stream. from the incoming message stream.
Precondition: There must be a function of name UserMsg_message_name declared Precondition: There must be a function of name UserMsg_message_name declared
for CHud. Eg, CHud::UserMsg_Health() must be declared if you want to for CHud. Eg, CHud::UserMsg_Health() must be declared if you want to
use HOOK_MESSAGE( Health ); use HOOK_MESSAGE( Health );
DECLARE_MESSAGE( message_name ) DECLARE_MESSAGE( message_name )
For each HOOK_MESSAGE you must have an equivalent DECLARE_MESSAGE. This creates For each HOOK_MESSAGE you must have an equivalent DECLARE_MESSAGE. This creates
a function which passes the hooked messages into the CHud object. a function which passes the hooked messages into the CHud object.
HOOK_COMMAND(), DECLARE_COMMAND() HOOK_COMMAND(), DECLARE_COMMAND()
These two functions declare and hook console commands into the client dll. These two functions declare and hook console commands into the client dll.
HOOK_COMMAND( char *command, command_name ) HOOK_COMMAND( char *command, command_name )
Whenever the user types the 'command' at the console, the function 'command_name' Whenever the user types the 'command' at the console, the function 'command_name'
will be called. will be called.
Precondition: There must be a function of the name UserCmd_command_name declared Precondition: There must be a function of the name UserCmd_command_name declared
for CHud. Eg, CHud::UserMsg_ShowScores() must be declared if you want to for CHud. Eg, CHud::UserMsg_ShowScores() must be declared if you want to
use HOOK_COMMAND( "+showscores", ShowScores ); use HOOK_COMMAND( "+showscores", ShowScores );
DECLARE_COMMAND( command_name ) DECLARE_COMMAND( command_name )
For each HOOK_COMMAND you must have an equivelant DECLARE_COMMAND. This creates For each HOOK_COMMAND you must have an equivelant DECLARE_COMMAND. This creates
a function which passes the hooked commands into the CHud object. a function which passes the hooked commands into the CHud object.

82
debug.bat
View File

@ -1,42 +1,42 @@
@echo off @echo off
set MSDEV=BuildConsole set MSDEV=BuildConsole
set CONFIG=/ShowTime /ShowAgent /nologo /cfg= set CONFIG=/ShowTime /ShowAgent /nologo /cfg=
set MSDEV=msdev set MSDEV=msdev
set CONFIG=/make set CONFIG=/make
set build_type=debug set build_type=debug
set BUILD_ERROR= set BUILD_ERROR=
call vcvars32 call vcvars32
%MSDEV% engine/engine.dsp %CONFIG%"engine - Win32 Debug" %build_target% %MSDEV% engine/engine.dsp %CONFIG%"engine - Win32 Debug" %build_target%
if errorlevel 1 set BUILD_ERROR=1 if errorlevel 1 set BUILD_ERROR=1
%MSDEV% mainui/mainui.dsp %CONFIG%"mainui - Win32 Debug" %build_target% %MSDEV% mainui/mainui.dsp %CONFIG%"mainui - Win32 Debug" %build_target%
if errorlevel 1 set BUILD_ERROR=1 if errorlevel 1 set BUILD_ERROR=1
if "%BUILD_ERROR%"=="" goto build_ok if "%BUILD_ERROR%"=="" goto build_ok
echo ********************* echo *********************
echo ********************* echo *********************
echo *** Build Errors! *** echo *** Build Errors! ***
echo ********************* echo *********************
echo ********************* echo *********************
echo press any key to exit echo press any key to exit
echo ********************* echo *********************
pause>nul pause>nul
goto done goto done
@rem @rem
@rem Successful build @rem Successful build
@rem @rem
:build_ok :build_ok
rem //delete log files rem //delete log files
if exist engine\engine.plg del /f /q engine\engine.plg if exist engine\engine.plg del /f /q engine\engine.plg
if exist mainui\mainui.plg del /f /q mainui\mainui.plg if exist mainui\mainui.plg del /f /q mainui\mainui.plg
echo echo
echo Build succeeded! echo Build succeeded!
echo echo
:done :done

3
dlls/Wxdebug.cpp
View File

@ -22,8 +22,6 @@
// the module specific types and m_dwLevel is set to the greater of the global // the module specific types and m_dwLevel is set to the greater of the global
// and the module specific settings. // and the module specific settings.
#if defined(_DEBUG) && defined(_WIN32)
#include <stdarg.h> #include <stdarg.h>
#include <stdio.h> #include <stdio.h>
@ -33,6 +31,7 @@
#include <tchar.h> #include <tchar.h>
#ifdef _DEBUG
void WINAPI DbgInitModuleName(void); void WINAPI DbgInitModuleName(void);
void WINAPI DbgInitModuleSettings(void); void WINAPI DbgInitModuleSettings(void);

10
dlls/hl.def
View File

@ -1,5 +1,5 @@
LIBRARY hl LIBRARY hl
EXPORTS EXPORTS
GiveFnptrsToDll @1 GiveFnptrsToDll @1
SECTIONS SECTIONS
.data READ WRITE .data READ WRITE

1494
dlls/hl.dsp
View File

File diff suppressed because it is too large Load Diff

2
dlls/mpstubb.cpp
View File

@ -74,7 +74,7 @@ void CBaseMonster::MonsterInitDead( void )
// Setup health counters, etc. // Setup health counters, etc.
BecomeDead(); BecomeDead();
SetThink( &CBaseMonster::CorpseFallThink ); SetThink( &CorpseFallThink );
pev->nextthink = gpGlobals->time + 0.5; pev->nextthink = gpGlobals->time + 0.5;
} }

2
dlls/stats.cpp
View File

@ -15,7 +15,7 @@
#include "weapons.h" #include "weapons.h"
#include "soundent.h" #include "soundent.h"
#include "monsters.h" #include "monsters.h"
#include "../engine/shake.h" #include "..\engine\shake.h"
#include "decals.h" #include "decals.h"
#include "gamerules.h" #include "gamerules.h"

1
dlls/util.cpp
View File

@ -1578,7 +1578,6 @@ void UTIL_StripToken( const char *pKey, char *pDest )
pDest[i] = 0; pDest[i] = 0;
} }
// -------------------------------------------------------------- // --------------------------------------------------------------
// //
// CSave // CSave

10
engine/cdll_int.h
View File

@ -93,12 +93,6 @@ typedef struct client_textmessage_s
const char *pMessage; const char *pMessage;
} client_textmessage_t; } client_textmessage_t;
#if __MSC_VER == 1200
#define longlong_t __int64
#else
#define longlong_t long long
#endif
typedef struct hud_player_info_s typedef struct hud_player_info_s
{ {
char *name; char *name;
@ -112,7 +106,7 @@ typedef struct hud_player_info_s
short topcolor; short topcolor;
short bottomcolor; short bottomcolor;
unsigned longlong_t m_nSteamID_1; unsigned long long m_nSteamID;
} hud_player_info_t; } hud_player_info_t;
typedef struct cl_enginefuncs_s typedef struct cl_enginefuncs_s
@ -311,4 +305,4 @@ typedef struct cl_enginefuncs_s
} }
#endif #endif
#endif//CDLL_INT_H #endif//CDLL_INT_H

1242
engine/engine.dsp
View File

File diff suppressed because it is too large Load Diff

122
make_sdk.bat
View File

@ -1,62 +1,62 @@
@echo off @echo off
color 5A color 5A
echo XashXT Group 2010 (C) echo XashXT Group 2010 (C)
echo Create Xash3D SDK echo Create Xash3D SDK
echo. echo.
if not exist D:\Xash3D\src_main\xash_sdk/ mkdir D:\Xash3D\src_main\xash_sdk\ if not exist D:\Xash3D\src_main\xash_sdk/ mkdir D:\Xash3D\src_main\xash_sdk\
if not exist D:\Xash3D\src_main\xash_sdk\engine/ mkdir D:\Xash3D\src_main\xash_sdk\engine\ if not exist D:\Xash3D\src_main\xash_sdk\engine/ mkdir D:\Xash3D\src_main\xash_sdk\engine\
if not exist D:\Xash3D\src_main\xash_sdk\common/ mkdir D:\Xash3D\src_main\xash_sdk\common\ if not exist D:\Xash3D\src_main\xash_sdk\common/ mkdir D:\Xash3D\src_main\xash_sdk\common\
if not exist D:\Xash3D\src_main\xash_sdk\mainui/ mkdir D:\Xash3D\src_main\xash_sdk\mainui\ if not exist D:\Xash3D\src_main\xash_sdk\mainui/ mkdir D:\Xash3D\src_main\xash_sdk\mainui\
if not exist D:\Xash3D\src_main\xash_sdk\mainui\legacy/ mkdir D:\Xash3D\src_main\xash_sdk\mainui\legacy if not exist D:\Xash3D\src_main\xash_sdk\mainui\legacy/ mkdir D:\Xash3D\src_main\xash_sdk\mainui\legacy
if not exist D:\Xash3D\src_main\xash_sdk\utils/ mkdir D:\Xash3D\src_main\xash_sdk\utils\ if not exist D:\Xash3D\src_main\xash_sdk\utils/ mkdir D:\Xash3D\src_main\xash_sdk\utils\
if not exist D:\Xash3D\src_main\xash_sdk\utils\makefont/ mkdir D:\Xash3D\src_main\xash_sdk\utils\makefont if not exist D:\Xash3D\src_main\xash_sdk\utils\makefont/ mkdir D:\Xash3D\src_main\xash_sdk\utils\makefont
if not exist D:\Xash3D\src_main\xash_sdk\utils\vgui/ mkdir D:\Xash3D\src_main\xash_sdk\utils\vgui if not exist D:\Xash3D\src_main\xash_sdk\utils\vgui/ mkdir D:\Xash3D\src_main\xash_sdk\utils\vgui
if not exist D:\Xash3D\src_main\xash_sdk\utils\vgui\include/ mkdir D:\Xash3D\src_main\xash_sdk\utils\vgui\include if not exist D:\Xash3D\src_main\xash_sdk\utils\vgui\include/ mkdir D:\Xash3D\src_main\xash_sdk\utils\vgui\include
if not exist D:\Xash3D\src_main\xash_sdk\utils\vgui\lib/ mkdir D:\Xash3D\src_main\xash_sdk\utils\vgui\lib if not exist D:\Xash3D\src_main\xash_sdk\utils\vgui\lib/ mkdir D:\Xash3D\src_main\xash_sdk\utils\vgui\lib
if not exist D:\Xash3D\src_main\xash_sdk\utils\vgui\lib\win32_vc6/ mkdir D:\Xash3D\src_main\xash_sdk\utils\vgui\lib\win32_vc6 if not exist D:\Xash3D\src_main\xash_sdk\utils\vgui\lib\win32_vc6/ mkdir D:\Xash3D\src_main\xash_sdk\utils\vgui\lib\win32_vc6
if not exist D:\Xash3D\src_main\xash_sdk\game_launch/ mkdir D:\Xash3D\src_main\xash_sdk\game_launch\ if not exist D:\Xash3D\src_main\xash_sdk\game_launch/ mkdir D:\Xash3D\src_main\xash_sdk\game_launch\
if not exist D:\Xash3D\src_main\xash_sdk\cl_dll/ mkdir D:\Xash3D\src_main\xash_sdk\cl_dll\ if not exist D:\Xash3D\src_main\xash_sdk\cl_dll/ mkdir D:\Xash3D\src_main\xash_sdk\cl_dll\
if not exist D:\Xash3D\src_main\xash_sdkcl_dll\hl/ mkdir D:\Xash3D\src_main\xash_sdk\cl_dll\hl\ if not exist D:\Xash3D\src_main\xash_sdkcl_dll\hl/ mkdir D:\Xash3D\src_main\xash_sdk\cl_dll\hl\
if not exist D:\Xash3D\src_main\xash_sdk\dlls/ mkdir D:\Xash3D\src_main\xash_sdk\dlls\ if not exist D:\Xash3D\src_main\xash_sdk\dlls/ mkdir D:\Xash3D\src_main\xash_sdk\dlls\
if not exist D:\Xash3D\src_main\xash_sdk\dlls\wpn_shared/ mkdir D:\Xash3D\src_main\xash_sdk\dlls\wpn_shared\ if not exist D:\Xash3D\src_main\xash_sdk\dlls\wpn_shared/ mkdir D:\Xash3D\src_main\xash_sdk\dlls\wpn_shared\
if not exist D:\Xash3D\src_main\xash_sdk\game_shared/ mkdir D:\Xash3D\src_main\xash_sdk\game_shared\ if not exist D:\Xash3D\src_main\xash_sdk\game_shared/ mkdir D:\Xash3D\src_main\xash_sdk\game_shared\
if not exist D:\Xash3D\src_main\xash_sdk\pm_shared/ mkdir D:\Xash3D\src_main\xash_sdk\pm_shared\ if not exist D:\Xash3D\src_main\xash_sdk\pm_shared/ mkdir D:\Xash3D\src_main\xash_sdk\pm_shared\
@copy /Y engine\*.h xash_sdk\engine\*.h @copy /Y engine\*.h xash_sdk\engine\*.h
@copy /Y game_launch\*.* xash_sdk\game_launch\*.* @copy /Y game_launch\*.* xash_sdk\game_launch\*.*
@copy /Y mainui\*.* xash_sdk\mainui\*.* @copy /Y mainui\*.* xash_sdk\mainui\*.*
@copy /Y mainui\legacy\*.* xash_sdk\mainui\legacy\*.* @copy /Y mainui\legacy\*.* xash_sdk\mainui\legacy\*.*
@copy /Y common\*.* xash_sdk\common\*.* @copy /Y common\*.* xash_sdk\common\*.*
@copy /Y cl_dll\*.* xash_sdk\cl_dll\*.* @copy /Y cl_dll\*.* xash_sdk\cl_dll\*.*
@copy /Y cl_dll\hl\*.* xash_sdk\cl_dll\hl\*.* @copy /Y cl_dll\hl\*.* xash_sdk\cl_dll\hl\*.*
@copy /Y dlls\*.* xash_sdk\dlls\*.* @copy /Y dlls\*.* xash_sdk\dlls\*.*
@copy /Y dlls\wpn_shared\*.* xash_sdk\dlls\wpn_shared\*.* @copy /Y dlls\wpn_shared\*.* xash_sdk\dlls\wpn_shared\*.*
@copy /Y utils\makefont\*.* xash_sdk\utils\makefont\*.* @copy /Y utils\makefont\*.* xash_sdk\utils\makefont\*.*
@copy /Y utils\vgui\include\*.* xash_sdk\utils\vgui\include\*.* @copy /Y utils\vgui\include\*.* xash_sdk\utils\vgui\include\*.*
@copy /Y utils\vgui\lib\win32_vc6\*.* xash_sdk\utils\vgui\lib\win32_vc6\*.* @copy /Y utils\vgui\lib\win32_vc6\*.* xash_sdk\utils\vgui\lib\win32_vc6\*.*
@copy /Y game_shared\*.* xash_sdk\game_shared\*.* @copy /Y game_shared\*.* xash_sdk\game_shared\*.*
@copy /Y pm_shared\*.* xash_sdk\pm_shared\*.* @copy /Y pm_shared\*.* xash_sdk\pm_shared\*.*
@copy /Y xash_sdk.dsw xash_sdk\xash_sdk.dsw @copy /Y xash_sdk.dsw xash_sdk\xash_sdk.dsw
echo Prepare OK! echo Prepare OK!
echo Please wait: creating SDK in progress echo Please wait: creating SDK in progress
C:\Progra~1\WinRar\rar a xash_sdk -dh -k -r -s -df -m5 @xash_sdk.lst >>makesdk.log C:\Progra~1\WinRar\rar a xash_sdk -dh -k -r -s -df -m5 @xash_sdk.lst >>makesdk.log
if errorlevel 1 goto error if errorlevel 1 goto error
if errorlevel 0 goto ok if errorlevel 0 goto ok
:ok :ok
cls cls
echo SDK was sucessfully created echo SDK was sucessfully created
echo and stored in RAR-chive "xash_sdk" echo and stored in RAR-chive "xash_sdk"
echo Press any key for exit. :-) echo Press any key for exit. :-)
if exist makesdk.log del /f /q makesdk.log if exist makesdk.log del /f /q makesdk.log
exit exit
:error :error
echo ****************************** echo ******************************
echo ***********Error!************* echo ***********Error!*************
echo ****************************** echo ******************************
echo *See makesdk.log for details** echo *See makesdk.log for details**
echo ****************************** echo ******************************
echo ****************************** echo ******************************
echo. echo.
echo press any key for exit :-( echo press any key for exit :-(
pause>nul pause>nul
exit exit

32
pm_shared/pm_defs.h
View File

@ -82,8 +82,6 @@ typedef struct physent_s
vec3_t vuser4; vec3_t vuser4;
} physent_t; } physent_t;
typedef struct hull_s hull_t;
typedef struct playermove_s typedef struct playermove_s
{ {
int player_index; // So we don't try to run the PM_CheckStuck nudging too quickly. int player_index; // So we don't try to run the PM_CheckStuck nudging too quickly.
@ -196,8 +194,13 @@ typedef struct playermove_s
int (*PM_PointContents)( float *p, int *truecontents /*filled in if this is non-null*/ ); int (*PM_PointContents)( float *p, int *truecontents /*filled in if this is non-null*/ );
int (*PM_TruePointContents)( float *p ); int (*PM_TruePointContents)( float *p );
int (*PM_HullPointContents)( struct hull_s *hull, int num, float *p ); int (*PM_HullPointContents)( struct hull_s *hull, int num, float *p );
#ifdef __MINGW32__
pmtrace_t *(*PM_PlayerTrace_real)( pmtrace_t * retvalue, float *start, float *end, int traceFlags, int ignore_pe );
#else
pmtrace_t (*PM_PlayerTrace)( float *start, float *end, int traceFlags, int ignore_pe ); pmtrace_t (*PM_PlayerTrace)( float *start, float *end, int traceFlags, int ignore_pe );
pmtrace_t *(*PM_TraceLine)( float *start, float *end, int flags, int usehulll, int ignore_pe ); #endif
struct pmtrace_s *(*PM_TraceLine)( float *start, float *end, int flags, int usehulll, int ignore_pe );
long (*RandomLong)( long lLow, long lHigh ); long (*RandomLong)( long lLow, long lHigh );
float (*RandomFloat)( float flLow, float flHigh ); float (*RandomFloat)( float flLow, float flHigh );
int (*PM_GetModelType)( struct model_s *mod ); int (*PM_GetModelType)( struct model_s *mod );
@ -215,9 +218,32 @@ typedef struct playermove_s
void (*PM_PlaySound)( int channel, const char *sample, float volume, float attenuation, int fFlags, int pitch ); void (*PM_PlaySound)( int channel, const char *sample, float volume, float attenuation, int fFlags, int pitch );
const char *(*PM_TraceTexture)( int ground, float *vstart, float *vend ); const char *(*PM_TraceTexture)( int ground, float *vstart, float *vend );
void (*PM_PlaybackEventFull)( int flags, int clientindex, unsigned short eventindex, float delay, float *origin, float *angles, float fparam1, float fparam2, int iparam1, int iparam2, int bparam1, int bparam2 ); void (*PM_PlaybackEventFull)( int flags, int clientindex, unsigned short eventindex, float delay, float *origin, float *angles, float fparam1, float fparam2, int iparam1, int iparam2, int bparam1, int bparam2 );
#ifdef __MINGW32__
pmtrace_t *(*PM_PlayerTraceEx_real) (pmtrace_t *retvalue, float *start, float *end, int traceFlags, int (*pfnIgnore)( physent_t *pe ));
#else
pmtrace_t (*PM_PlayerTraceEx) (float *start, float *end, int traceFlags, int (*pfnIgnore)( physent_t *pe )); pmtrace_t (*PM_PlayerTraceEx) (float *start, float *end, int traceFlags, int (*pfnIgnore)( physent_t *pe ));
#endif
int (*PM_TestPlayerPositionEx) (float *pos, pmtrace_t *ptrace, int (*pfnIgnore)( physent_t *pe )); int (*PM_TestPlayerPositionEx) (float *pos, pmtrace_t *ptrace, int (*pfnIgnore)( physent_t *pe ));
struct pmtrace_s *(*PM_TraceLineEx)( float *start, float *end, int flags, int usehulll, int (*pfnIgnore)( physent_t *pe )); struct pmtrace_s *(*PM_TraceLineEx)( float *start, float *end, int flags, int usehulll, int (*pfnIgnore)( physent_t *pe ));
struct msurface_s *(*PM_TraceSurface)( int ground, float *vstart, float *vend ); struct msurface_s *(*PM_TraceSurface)( int ground, float *vstart, float *vend );
} playermove_t; } playermove_t;
#ifdef __MINGW32__
static pmtrace_t _pm_globalresult, _pm_globaltmp;
static inline pmtrace_t PM_PlayerTrace_wrap( float *start, float *end, int traceFlags, int ignore_pe, playermove_t *pmove )
{
_pm_globaltmp = pmove->touchindex[MAX_PHYSENTS -1];
pmove->PM_PlayerTrace_real( &_pm_globalresult, start, end, traceFlags, ignore_pe );
return _pm_globalresult;
}
static inline pmtrace_t PM_PlayerTraceEx_wrap( float *start, float *end, int traceFlags, int (*pfnIgnore)( physent_t *pe ), playermove_t *pmove )
{
_pm_globaltmp = pmove->touchindex[MAX_PHYSENTS -1];
pmove->PM_PlayerTraceEx_real( &_pm_globalresult, start, end, traceFlags, pfnIgnore );
return _pm_globalresult;
}
#define PM_PlayerTrace(a,b,c,d) touchindex[MAX_PHYSENTS -1] = PM_PlayerTrace_wrap( a, b, c, d, pmove );pmove->touchindex[MAX_PHYSENTS -1] = _pm_globaltmp
#define PM_PlayerTraceEx(a,b,c,d) touchindex[MAX_PHYSENTS -1] = PM_PlayerTraceEx_wrap( a, b, c, d, pmove );pmove->touchindex[MAX_PHYSENTS -1] = _pm_globaltmp
#endif
#endif//PM_DEFS_H #endif//PM_DEFS_H

82
release.bat
View File

@ -1,42 +1,42 @@
@echo off @echo off
set MSDEV=BuildConsole set MSDEV=BuildConsole
set CONFIG=/ShowTime /ShowAgent /nologo /cfg= set CONFIG=/ShowTime /ShowAgent /nologo /cfg=
set MSDEV=msdev set MSDEV=msdev
set CONFIG=/make set CONFIG=/make
set build_type=release set build_type=release
set BUILD_ERROR= set BUILD_ERROR=
call vcvars32 call vcvars32
%MSDEV% engine/engine.dsp %CONFIG%"engine - Win32 Release" %build_target% %MSDEV% engine/engine.dsp %CONFIG%"engine - Win32 Release" %build_target%
if errorlevel 1 set BUILD_ERROR=1 if errorlevel 1 set BUILD_ERROR=1
%MSDEV% mainui/mainui.dsp %CONFIG%"mainui - Win32 Release" %build_target% %MSDEV% mainui/mainui.dsp %CONFIG%"mainui - Win32 Release" %build_target%
if errorlevel 1 set BUILD_ERROR=1 if errorlevel 1 set BUILD_ERROR=1
if "%BUILD_ERROR%"=="" goto build_ok if "%BUILD_ERROR%"=="" goto build_ok
echo ********************* echo *********************
echo ********************* echo *********************
echo *** Build Errors! *** echo *** Build Errors! ***
echo ********************* echo *********************
echo ********************* echo *********************
echo press any key to exit echo press any key to exit
echo ********************* echo *********************
pause>nul pause>nul
goto done goto done
@rem @rem
@rem Successful build @rem Successful build
@rem @rem
:build_ok :build_ok
rem //delete log files rem //delete log files
if exist engine\engine.plg del /f /q engine\engine.plg if exist engine\engine.plg del /f /q engine\engine.plg
if exist mainui\mainui.plg del /f /q mainui\mainui.plg if exist mainui\mainui.plg del /f /q mainui\mainui.plg
echo echo
echo Build succeeded! echo Build succeeded!
echo echo
:done :done

2
utils/makefont/CreateFont.bat
View File

@ -1,2 +1,2 @@
makefont.exe -font "Terminal" fonts.wad makefont.exe -font "Terminal" fonts.wad
pause pause

130
xash.dsw
View File

@ -1,65 +1,65 @@
Microsoft Developer Studio Workspace File, Format Version 6.00 Microsoft Developer Studio Workspace File, Format Version 6.00
# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! # WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
############################################################################### ###############################################################################
Project: "hl"=".\dlls\hl.dsp" - Package Owner=<4> Project: "hl"=".\dlls\hl.dsp" - Package Owner=<4>
Package=<5> Package=<5>
{{{ {{{
}}} }}}
Package=<4> Package=<4>
{{{ {{{
}}} }}}
############################################################################### ###############################################################################
Project: "client"=".\cl_dll\cl_dll.dsp" - Package Owner=<4> Project: "client"=".\cl_dll\cl_dll.dsp" - Package Owner=<4>
Package=<5> Package=<5>
{{{ {{{
}}} }}}
Package=<4> Package=<4>
{{{ {{{
}}} }}}
############################################################################### ###############################################################################
Project: "mainui"=".\mainui\mainui.dsp" - Package Owner=<4> Project: "mainui"=".\mainui\mainui.dsp" - Package Owner=<4>
Package=<5> Package=<5>
{{{ {{{
}}} }}}
Package=<4> Package=<4>
{{{ {{{
}}} }}}
############################################################################### ###############################################################################
Project: "engine"=".\engine\engine.dsp" - Package Owner=<4> Project: "engine"=".\engine\engine.dsp" - Package Owner=<4>
Package=<5> Package=<5>
{{{ {{{
}}} }}}
Package=<4> Package=<4>
{{{ {{{
}}} }}}
############################################################################### ###############################################################################
Global: Global:
Package=<5> Package=<5>
{{{ {{{
}}} }}}
Package=<3> Package=<3>
{{{ {{{
}}} }}}
############################################################################### ###############################################################################

130
xash_sdk.dsw
View File

@ -1,65 +1,65 @@
Microsoft Developer Studio Workspace File, Format Version 6.00 Microsoft Developer Studio Workspace File, Format Version 6.00
# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! # WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
############################################################################### ###############################################################################
Project: "hl"=".\dlls\hl.dsp" - Package Owner=<4> Project: "hl"=".\dlls\hl.dsp" - Package Owner=<4>
Package=<5> Package=<5>
{{{ {{{
}}} }}}
Package=<4> Package=<4>
{{{ {{{
}}} }}}
############################################################################### ###############################################################################
Project: "client"=".\cl_dll\cl_dll.dsp" - Package Owner=<4> Project: "client"=".\cl_dll\cl_dll.dsp" - Package Owner=<4>
Package=<5> Package=<5>
{{{ {{{
}}} }}}
Package=<4> Package=<4>
{{{ {{{
}}} }}}
############################################################################### ###############################################################################
Project: "mainui"=".\mainui\mainui.dsp" - Package Owner=<4> Project: "mainui"=".\mainui\mainui.dsp" - Package Owner=<4>
Package=<5> Package=<5>
{{{ {{{
}}} }}}
Package=<4> Package=<4>
{{{ {{{
}}} }}}
############################################################################### ###############################################################################
Project: "game"=".\game_launch\game.dsp" - Package Owner=<4> Project: "game"=".\game_launch\game.dsp" - Package Owner=<4>
Package=<5> Package=<5>
{{{ {{{
}}} }}}
Package=<4> Package=<4>
{{{ {{{
}}} }}}
############################################################################### ###############################################################################
Global: Global:
Package=<5> Package=<5>
{{{ {{{
}}} }}}
Package=<3> Package=<3>
{{{ {{{
}}} }}}
############################################################################### ###############################################################################

42
xash_sdk.lst
View File

@ -1,22 +1,22 @@
//======================================================================= //=======================================================================
// Copyright XashXT Group 2011 Š // Copyright XashXT Group 2011 Š
// list with SDK directories // list with SDK directories
//======================================================================= //=======================================================================
// global stuff // global stuff
xash_sdk\xash_sdk.dsw xash_sdk\xash_sdk.dsw
xash_sdk\cl_dll\ xash_sdk\cl_dll\
xash_sdk\cl_dll\hl\ xash_sdk\cl_dll\hl\
xash_sdk\common\ xash_sdk\common\
xash_sdk\dlls\ xash_sdk\dlls\
xash_sdk\game_shared\ xash_sdk\game_shared\
xash_sdk\game_launch\ xash_sdk\game_launch\
xash_sdk\engine\ xash_sdk\engine\
xash_sdk\pm_shared\ xash_sdk\pm_shared\
xash_sdk\mainui\ xash_sdk\mainui\
xash_dsk\mainui\legacy xash_dsk\mainui\legacy
xash_sdk\utils\ xash_sdk\utils\
xash_sdk\makefont\ xash_sdk\makefont\
xash_sdk\utils\vgui\ xash_sdk\utils\vgui\
xash_sdk\utils\vgui\include\ xash_sdk\utils\vgui\include\
xash_sdk\utils\vgui\lib\win32_vc6\ xash_sdk\utils\vgui\lib\win32_vc6\