reHLDS/rehlds
2
0
Fork 0
mirror of https://github.com/rehlds/rehlds.git synced 2025-02-06 18:42:26 +03:00
Code Issues Projects Releases Wiki Activity

Clean up code/dwarf

Browse Source
This commit is contained in:
s1lentq 2016-11-22 04:46:48 +07:00
parent 381a4c0ab2
commit 5c1be6a61d
105 changed files with 761 additions and 3018 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
rehlds/common/kbutton.h
View File

@ -32,13 +32,10 @@
#pragma once #pragma once
#endif #endif
/* <31b2a> ../common/kbutton.h:7 */
typedef struct kbutton_s typedef struct kbutton_s
{ {
int down[2]; int down[2];
int state; int state;
} kbutton_t; } kbutton_t;
#endif // KBUTTON_H #endif // KBUTTON_H

46
rehlds/common/mathlib.h
View File

@ -1,37 +1,47 @@
/*** /*
* *
* Copyright (c) 1996-2002, Valve LLC. All rights reserved. * 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
* This product contains software technology licensed from Id * Free Software Foundation; either version 2 of the License, or (at
* Software, Inc. ("Id Technology"). Id Technology (c) 1996 Id Software, Inc. * your option) any later version.
* All Rights Reserved.
* *
* Use, distribution, and modification of this source code and/or resulting * This program is distributed in the hope that it will be useful, but
* object code is restricted to non-commercial enhancements to products from * WITHOUT ANY WARRANTY; without even the implied warranty of
* Valve LLC. All other use, distribution, or modification is prohibited * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* without written permission from Valve LLC. * 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
*
* In addition, as a special exception, the author gives permission to
* link the code of this program with the Half-Life Game Engine ("HL
* Engine") and Modified Game Libraries ("MODs") developed by Valve,
* L.L.C ("Valve"). You must obey the GNU General Public License in all
* respects for all of the code used other than the HL Engine and MODs
* from Valve. If you modify this file, you may extend this exception
* to your version of the file, but you are not obligated to do so. If
* you do not wish to do so, delete this exception statement from your
* version.
*
*/
#ifndef MATHLIB_H #ifndef MATHLIB_H
#define MATHLIB_H #define MATHLIB_H
#ifdef _WIN32
#pragma once
#endif
/* <42b7f> ../common/mathlib.h:3 */
typedef float vec_t; typedef float vec_t;
/* <42b91> ../common/mathlib.h:6 */
#if !defined DID_VEC3_T_DEFINE && !defined vec3_t #if !defined DID_VEC3_T_DEFINE && !defined vec3_t
#define DID_VEC3_T_DEFINE #define DID_VEC3_T_DEFINE
typedef vec_t vec3_t[3]; typedef vec_t vec3_t[3];
#endif #endif
/* <80013> ../common/mathlib.h:8 */
typedef vec_t vec4_t[4]; typedef vec_t vec4_t[4];
typedef int fixed16_t;
/* <42bac> ../common/mathlib.h:18 */
typedef int fixed16_t; /* size: 4 */
/* <42bb7> ../common/mathlib.h:60 */
typedef union DLONG_u typedef union DLONG_u
{ {
int i[2]; int i[2];

10
rehlds/common/netadr.h
View File

@ -12,7 +12,7 @@
* without written permission from Valve LLC. * without written permission from Valve LLC.
* *
****/ ****/
// netadr.h
#ifndef NETADR_H #ifndef NETADR_H
#define NETADR_H #define NETADR_H
#ifdef _WIN32 #ifdef _WIN32
@ -31,10 +31,10 @@ typedef enum
typedef struct netadr_s typedef struct netadr_s
{ {
netadrtype_t type; netadrtype_t type;
unsigned char ip[4]; unsigned char ip[4];
unsigned char ipx[10]; unsigned char ipx[10];
unsigned short port; unsigned short port;
} netadr_t; } netadr_t;
#endif // NETADR_H #endif // NETADR_H

5
rehlds/common/quakedef.h
View File

@ -27,18 +27,15 @@
*/ */
#pragma once #pragma once
/* <19039> ../common/quakedef.h:29 */ typedef int BOOL;
typedef int BOOL; /* size: 4 */
// user message // user message
#define MAX_USER_MSG_DATA 192 #define MAX_USER_MSG_DATA 192
/* <627f> ../common/quakedef.h:137 */
//moved to com_model.h //moved to com_model.h
//typedef struct cache_user_s //typedef struct cache_user_s
//{ //{
// void *data; // void *data;
//} cache_user_t; //} cache_user_t;
/* <4313b> ../common/quakedef.h:162 */
typedef int (*pfnUserMsgHook)(const char *, int, void *); typedef int (*pfnUserMsgHook)(const char *, int, void *);

2
rehlds/common/vmodes.h
View File

@ -27,8 +27,6 @@
*/ */
#pragma once #pragma once
/* <430ee> ../common/vmodes.h:40 */
typedef struct rect_s typedef struct rect_s
{ {
int left, right, top, bottom; int left, right, top, bottom;

115
rehlds/engine/cl_null.cpp
View File

@ -52,182 +52,67 @@ cvar_t console;
#endif //HOOK_ENGINE #endif //HOOK_ENGINE
/* <1c38b> ../engine/cl_null.c:18 */
void CL_RecordHUDCommand(char *cmdname) { } void CL_RecordHUDCommand(char *cmdname) { }
/* <1c3b2> ../engine/cl_null.c:19 */
void R_DecalRemoveAll(int textureIndex) { } void R_DecalRemoveAll(int textureIndex) { }
/* <1c3d9> ../engine/cl_null.c:20 */
void CL_CheckForResend(void) { } void CL_CheckForResend(void) { }
/* <1c3ed> ../engine/cl_null.c:21 */
qboolean CL_CheckFile(sizebuf_t *msg, char *filename) { return 1; } qboolean CL_CheckFile(sizebuf_t *msg, char *filename) { return 1; }
/* <1c42c> ../engine/cl_null.c:22 */
void CL_ClearClientState(void) { } void CL_ClearClientState(void) { }
/* <1c440> ../engine/cl_null.c:23 */
void CL_Connect_f(void) { } void CL_Connect_f(void) { }
/* <1c454> ../engine/cl_null.c:24 */
void CL_DecayLights(void) { } void CL_DecayLights(void) { }
/* <1c468> ../engine/cl_null.c:25 */
void CL_Disconnect(void) { } void CL_Disconnect(void) { }
/* <1c47c> ../engine/cl_null.c:26 */
void CL_Disconnect_f(void) { } void CL_Disconnect_f(void) { }
/* <1c490> ../engine/cl_null.c:27 */
void CL_EmitEntities(void) { } void CL_EmitEntities(void) { }
/* <1c4a4> ../engine/cl_null.c:28 */
void CL_InitClosest(void) { } void CL_InitClosest(void) { }
/* <1c4b7> ../engine/cl_null.c:29 */
void CL_Init(void) { } void CL_Init(void) { }
/* <1c4cb> ../engine/cl_null.c:30 */
void EXT_FUNC CL_Particle(vec_t *origin, int color, float life, int zpos, int zvel) { } void EXT_FUNC CL_Particle(vec_t *origin, int color, float life, int zpos, int zvel) { }
/* <1c530> ../engine/cl_null.c:31 */
void CL_PredictMove(qboolean repredicting) { } void CL_PredictMove(qboolean repredicting) { }
/* <1c557> ../engine/cl_null.c:32 */
void CL_PrintLogos(void) { } void CL_PrintLogos(void) { }
/* <1c56b> ../engine/cl_null.c:33 */
void CL_ReadPackets(void) { } void CL_ReadPackets(void) { }
/* <1c57f> ../engine/cl_null.c:34 */
qboolean CL_RequestMissingResources(void) { return 0; } qboolean CL_RequestMissingResources(void) { return 0; }
/* <1c597> ../engine/cl_null.c:35 */
void CL_Move(void) { } void CL_Move(void) { }
/* <1c5ab> ../engine/cl_null.c:36 */
void CL_SendConnectPacket(void) { } void CL_SendConnectPacket(void) { }
/* <1c5bf> ../engine/cl_null.c:38 */
void CL_StopPlayback(void) { } void CL_StopPlayback(void) { }
/* <1c5d3> ../engine/cl_null.c:39 */
void CL_UpdateSoundFade(void) { } void CL_UpdateSoundFade(void) { }
/* <1c5e7> ../engine/cl_null.c:40 */
void CL_AdjustClock(void) { } void CL_AdjustClock(void) { }
void CL_HudMessage(const char *pMessage) { } void CL_HudMessage(const char *pMessage) { }
int Key_CountBindings(void) { return 0; } int Key_CountBindings(void) { return 0; }
/* <1c5fb> ../engine/cl_null.c:43 */
void Key_WriteBindings(FileHandle_t f) { } void Key_WriteBindings(FileHandle_t f) { }
/* <1c620> ../engine/cl_null.c:44 */
extern "C" void ClientDLL_UpdateClientData(void) { } extern "C" void ClientDLL_UpdateClientData(void) { }
/* <1c634> ../engine/cl_null.c:45 */
extern "C" void ClientDLL_HudVidInit(void) { } extern "C" void ClientDLL_HudVidInit(void) { }
/* <1c648> ../engine/cl_null.c:46 */
void Chase_Init(void) { } void Chase_Init(void) { }
/* <1c65c> ../engine/cl_null.c:47 */
void Key_Init(void) { } void Key_Init(void) { }
/* <1c670> ../engine/cl_null.c:48 */
extern "C" void ClientDLL_Init(void) { } extern "C" void ClientDLL_Init(void) { }
extern "C" void ClientDLL_Shutdown(void) { } extern "C" void ClientDLL_Shutdown(void) { }
/* <1c684> ../engine/cl_null.c:49 */
void Con_Shutdown(void) { } void Con_Shutdown(void) { }
/* <1c698> ../engine/cl_null.c:50 */
int DispatchDirectUserMsg(const char *pszName, int iSize, void *pBuf) { return 0; } int DispatchDirectUserMsg(const char *pszName, int iSize, void *pBuf) { return 0; }
/* <1c6df> ../engine/cl_null.c:51 */
void CL_ShutDownUsrMessages(void) { } void CL_ShutDownUsrMessages(void) { }
/* <1c6f3> ../engine/cl_null.c:52 */
void CL_ShutDownClientStatic(void) { } void CL_ShutDownClientStatic(void) { }
/* <1c707> ../engine/cl_null.c:54 */
void ClientDLL_MoveClient(struct playermove_s *pmove) { } void ClientDLL_MoveClient(struct playermove_s *pmove) { }
void ClientDLL_DeactivateMouse(void) { } void ClientDLL_DeactivateMouse(void) { }
void ClientDLL_MouseEvent(int mstate) { } void ClientDLL_MouseEvent(int mstate) { }
/* <1c73a> ../engine/cl_null.c:56 */
void CL_Shutdown(void) { } void CL_Shutdown(void) { }
/* <1c74e> ../engine/cl_null.c:58 */
extern "C" void ClientDLL_Frame(double time) { } extern "C" void ClientDLL_Frame(double time) { }
/* <1c775> ../engine/cl_null.c:59 */
extern "C" void ClientDLL_CAM_Think(void) { } extern "C" void ClientDLL_CAM_Think(void) { }
/* <1c788> ../engine/cl_null.c:60 */
void CL_InitEventSystem(void) { } void CL_InitEventSystem(void) { }
/* <1c79b> ../engine/cl_null.c:61 */
void CL_CheckClientState(void) { } void CL_CheckClientState(void) { }
/* <1c7af> ../engine/cl_null.c:62 */
void CL_RedoPrediction(void) { } void CL_RedoPrediction(void) { }
/* <1c7c3> ../engine/cl_null.c:63 */
void CL_SetLastUpdate(void) { } void CL_SetLastUpdate(void) { }
/* <1c7d7> ../engine/cl_null.c:65 */
void EXT_FUNC Con_NPrintf(int idx, const char *fmt, ...) { } void EXT_FUNC Con_NPrintf(int idx, const char *fmt, ...) { }
void Sequence_OnLevelLoad( const char* mapName ) { } void Sequence_OnLevelLoad( const char* mapName ) { }
/* <1c80d> ../engine/cl_null.c:69 */
void CL_WriteMessageHistory(int starting_count, int cmd) { } void CL_WriteMessageHistory(int starting_count, int cmd) { }
/* <1c842> ../engine/cl_null.c:71 */
void CL_MoveSpectatorCamera(void) { } void CL_MoveSpectatorCamera(void) { }
/* <1c856> ../engine/cl_null.c:72 */
void CL_AddVoiceToDatagram(qboolean bFinal) { } void CL_AddVoiceToDatagram(qboolean bFinal) { }
/* <1c87d> ../engine/cl_null.c:73 */
void CL_VoiceIdle(void) { } void CL_VoiceIdle(void) { }
/* <1c891> ../engine/cl_null.c:75 */
void PollDInputDevices(void) { } void PollDInputDevices(void) { }
/* <1c8a4> ../engine/cl_null.c:77 */
void CL_KeepConnectionActive(void) { } void CL_KeepConnectionActive(void) { }
/* <1c8b8> ../engine/cl_null.c:79 */
void CL_UpdateModuleC(void) { } void CL_UpdateModuleC(void) { }
/* <1c8cc> ../engine/cl_null.c:81 */
int EXT_FUNC VGuiWrap2_IsInCareerMatch(void) { return 0; } int EXT_FUNC VGuiWrap2_IsInCareerMatch(void) { return 0; }
/* <1c8e3> ../engine/cl_null.c:83 */
void VguiWrap2_GetCareerUI(void) { } void VguiWrap2_GetCareerUI(void) { }
/* <1c8f6> ../engine/cl_null.c:85 */
int EXT_FUNC VGuiWrap2_GetLocalizedStringLength(const char *label) { return 0; } int EXT_FUNC VGuiWrap2_GetLocalizedStringLength(const char *label) { return 0; }
void VGuiWrap2_LoadingStarted(const char *resourceType, const char *resourceName) {} void VGuiWrap2_LoadingStarted(const char *resourceType, const char *resourceName) {}
/* <1c921> ../engine/cl_null.c:87 */
void EXT_FUNC ConstructTutorMessageDecayBuffer(int *buffer, int bufferLength) { } void EXT_FUNC ConstructTutorMessageDecayBuffer(int *buffer, int bufferLength) { }
/* <1c95c> ../engine/cl_null.c:88 */
void EXT_FUNC ProcessTutorMessageDecayBuffer(int *buffer, int bufferLength) { } void EXT_FUNC ProcessTutorMessageDecayBuffer(int *buffer, int bufferLength) { }
/* <1c991> ../engine/cl_null.c:89 */
int EXT_FUNC GetTimesTutorMessageShown(int id) { return -1; } int EXT_FUNC GetTimesTutorMessageShown(int id) { return -1; }
/* <1c9bb> ../engine/cl_null.c:90 */
void EXT_FUNC RegisterTutorMessageShown(int mid) { } void EXT_FUNC RegisterTutorMessageShown(int mid) { }
/* <1c9e2> ../engine/cl_null.c:91 */
void EXT_FUNC ResetTutorMessageDecayData(void) { } void EXT_FUNC ResetTutorMessageDecayData(void) { }
/* <1c9f5> ../engine/cl_null.c:92 */
void SetCareerAudioState(int state) { } void SetCareerAudioState(int state) { }

22
rehlds/engine/client.h
View File

@ -63,7 +63,6 @@ typedef enum cactive_e
ca_active, ca_active,
} cactive_t; } cactive_t;
/* <1523b> ../engine/client.h:70 */
typedef struct cmd_s typedef struct cmd_s
{ {
usercmd_t cmd; usercmd_t cmd;
@ -75,7 +74,6 @@ typedef struct cmd_s
int sendsize; int sendsize;
} cmd_t; } cmd_t;
/* <152b1> ../engine/client.h:85 */
typedef struct frame_s typedef struct frame_s
{ {
double receivedtime; double receivedtime;
@ -98,7 +96,6 @@ typedef struct frame_s
uint16 msgbytes; uint16 msgbytes;
} frame_t; } frame_t;
/* <153e9> ../engine/client.h:127 */
typedef struct player_info_s typedef struct player_info_s
{ {
int userid; int userid;
@ -120,7 +117,6 @@ typedef struct player_info_s
uint64 m_nSteamID; uint64 m_nSteamID;
} player_info_t; } player_info_t;
/* <277f5> ../engine/client.h:208 */
typedef struct soundfade_s typedef struct soundfade_s
{ {
int nStartPercent; int nStartPercent;
@ -131,7 +127,6 @@ typedef struct soundfade_s
int soundFadeInTime; int soundFadeInTime;
} soundfade_t; } soundfade_t;
/* <1f23> ../engine/client.h:223 */
typedef struct client_static_s typedef struct client_static_s
{ {
cactive_t state; cactive_t state;
@ -187,7 +182,6 @@ typedef struct client_static_s
int build_num; int build_num;
} client_static_t; } client_static_t;
/* <1bda4> ../engine/client.h:320 */
typedef struct client_state_s typedef struct client_state_s
{ {
int max_edicts; int max_edicts;
@ -264,7 +258,6 @@ typedef struct client_state_s
char downloadUrl[128]; char downloadUrl[128];
} client_state_t; } client_state_t;
/* <3a9c7> ../engine/client.h:645 */
typedef enum CareerStateType_e typedef enum CareerStateType_e
{ {
CAREER_NONE = 0, CAREER_NONE = 0,
@ -272,7 +265,6 @@ typedef enum CareerStateType_e
CAREER_PLAYING = 2, CAREER_PLAYING = 2,
} CareerStateType; } CareerStateType;
#ifdef HOOK_ENGINE #ifdef HOOK_ENGINE
#define g_pcls (*pcls) #define g_pcls (*pcls)
#define g_pcl (*pcl) #define g_pcl (*pcl)
@ -333,40 +325,26 @@ void Con_Shutdown(void);
int DispatchDirectUserMsg(const char *pszName, int iSize, void *pBuf); int DispatchDirectUserMsg(const char *pszName, int iSize, void *pBuf);
void CL_ShutDownUsrMessages(void); void CL_ShutDownUsrMessages(void);
void CL_ShutDownClientStatic(void); void CL_ShutDownClientStatic(void);
extern "C" void ClientDLL_MoveClient(struct playermove_s *ppmove); extern "C" void ClientDLL_MoveClient(struct playermove_s *ppmove);
void CL_Shutdown(void); void CL_Shutdown(void);
extern "C" void ClientDLL_Frame(double time); extern "C" void ClientDLL_Frame(double time);
extern "C" void ClientDLL_CAM_Think(void); extern "C" void ClientDLL_CAM_Think(void);
void CL_InitEventSystem(void); void CL_InitEventSystem(void);
void CL_CheckClientState(void); void CL_CheckClientState(void);
void CL_RedoPrediction(void); void CL_RedoPrediction(void);
void CL_SetLastUpdate(void); void CL_SetLastUpdate(void);
void Con_NPrintf(int idx, const char *fmt, ...); void Con_NPrintf(int idx, const char *fmt, ...);
void CL_WriteMessageHistory(int starting_count, int cmd); void CL_WriteMessageHistory(int starting_count, int cmd);
void CL_MoveSpectatorCamera(void); void CL_MoveSpectatorCamera(void);
void CL_AddVoiceToDatagram(qboolean bFinal); void CL_AddVoiceToDatagram(qboolean bFinal);
void CL_VoiceIdle(void); void CL_VoiceIdle(void);
void PollDInputDevices(void); void PollDInputDevices(void);
void CL_KeepConnectionActive(void); void CL_KeepConnectionActive(void);
void CL_UpdateModuleC(void); void CL_UpdateModuleC(void);
int VGuiWrap2_IsInCareerMatch(void); int VGuiWrap2_IsInCareerMatch(void);
void VguiWrap2_GetCareerUI(void); void VguiWrap2_GetCareerUI(void);
int VGuiWrap2_GetLocalizedStringLength(const char *label); int VGuiWrap2_GetLocalizedStringLength(const char *label);
void VGuiWrap2_LoadingStarted(const char *resourceType, const char *resourceName); void VGuiWrap2_LoadingStarted(const char *resourceType, const char *resourceName);
void ConstructTutorMessageDecayBuffer(int *buffer, int bufferLength); void ConstructTutorMessageDecayBuffer(int *buffer, int bufferLength);
void ProcessTutorMessageDecayBuffer(int *buffer, int bufferLength); void ProcessTutorMessageDecayBuffer(int *buffer, int bufferLength);
int GetTimesTutorMessageShown(int id); int GetTimesTutorMessageShown(int id);

46
rehlds/engine/cmd.cpp
View File

@ -45,20 +45,16 @@ cmdalias_t *cmd_alias;
cmd_function_t *cmd_functions; cmd_function_t *cmd_functions;
char *const cmd_null_string = ""; char *const cmd_null_string = "";
/* <4aad> ../engine/cmd.c:47 */
void Cmd_Wait_f(void) void Cmd_Wait_f(void)
{ {
cmd_wait = 1; cmd_wait = 1;
} }
/* <4d6b> ../engine/cmd.c:69 */
void Cbuf_Init(void) void Cbuf_Init(void)
{ {
SZ_Alloc("cmd_text", &cmd_text, MAX_CMD_BUFFER); SZ_Alloc("cmd_text", &cmd_text, MAX_CMD_BUFFER);
} }
/* <4d80> ../engine/cmd.c:83 */
// As new commands are generated from the console or keybindings, // As new commands are generated from the console or keybindings,
// the text is added to the end of the command buffer. // the text is added to the end of the command buffer.
void Cbuf_AddText(char *text) void Cbuf_AddText(char *text)
@ -74,7 +70,6 @@ void Cbuf_AddText(char *text)
SZ_Write(&cmd_text, text, len); SZ_Write(&cmd_text, text, len);
} }
/* <4dcf> ../engine/cmd.c:109 */
// When a command wants to issue other commands immediately, the text is // When a command wants to issue other commands immediately, the text is
// inserted at the beginning of the buffer, before any remaining unexecuted // inserted at the beginning of the buffer, before any remaining unexecuted
// commands. // commands.
@ -101,7 +96,7 @@ void Cbuf_InsertText(char *text)
char *temp = NULL; char *temp = NULL;
if (currLen) if (currLen)
{ {
temp = (char *)Z_Malloc(currLen); // TODO: Optimize: better use memmove without need for a temp buffer temp = (char *)Z_Malloc(currLen); // TODO: Optimize: better use memmove without need for a temp buffer
Q_memcpy(temp, cmd_text.data, currLen); Q_memcpy(temp, cmd_text.data, currLen);
SZ_Clear(&cmd_text); SZ_Clear(&cmd_text);
@ -117,7 +112,6 @@ void Cbuf_InsertText(char *text)
#endif // REHLDS_FIXES #endif // REHLDS_FIXES
} }
/* <4f05> ../engine/cmd.c:148 */
void Cbuf_InsertTextLines(char *text) void Cbuf_InsertTextLines(char *text)
{ {
int addLen = Q_strlen(text); int addLen = Q_strlen(text);
@ -144,7 +138,7 @@ void Cbuf_InsertTextLines(char *text)
char *temp = NULL; char *temp = NULL;
if (currLen) if (currLen)
{ {
temp = (char *)Z_Malloc(currLen); temp = (char *)Z_Malloc(currLen);
Q_memcpy(temp, cmd_text.data, currLen); Q_memcpy(temp, cmd_text.data, currLen);
SZ_Clear(&cmd_text); SZ_Clear(&cmd_text);
@ -162,7 +156,6 @@ void Cbuf_InsertTextLines(char *text)
#endif // REHLDS_FIXES #endif // REHLDS_FIXES
} }
/* <5d96> ../engine/cmd.c:193 */
// Pulls off \n terminated lines of text from the command buffer and sends // Pulls off \n terminated lines of text from the command buffer and sends
// them through Cmd_ExecuteString. Stops when the buffer is empty. // them through Cmd_ExecuteString. Stops when the buffer is empty.
// Normally called once per frame, but may be explicitly invoked. // Normally called once per frame, but may be explicitly invoked.
@ -244,7 +237,6 @@ void Cbuf_Execute(void)
} }
} }
/* <4e74> ../engine/cmd.c:271 */
void Cmd_StuffCmds_f(void) void Cmd_StuffCmds_f(void)
{ {
int i; int i;
@ -311,7 +303,6 @@ void Cmd_StuffCmds_f(void)
Z_Free(build); Z_Free(build);
} }
/* <5e43> ../engine/cmd.c:347 */
void Cmd_Exec_f(void) void Cmd_Exec_f(void)
{ {
const char *pszFileName; const char *pszFileName;
@ -413,7 +404,6 @@ void Cmd_Exec_f(void)
Mem_Free(pszFileData); Mem_Free(pszFileData);
} }
/* <4ac1> ../engine/cmd.c:493 */
void Cmd_Echo_f(void) void Cmd_Echo_f(void)
{ {
int i; int i;
@ -427,7 +417,6 @@ void Cmd_Echo_f(void)
Con_Printf("\n"); Con_Printf("\n");
} }
/* <4c38> ../engine/cmd.c:510 */
char *CopyString(char *in) char *CopyString(char *in)
{ {
char *out = (char *)Z_Malloc(Q_strlen(in) + 1); char *out = (char *)Z_Malloc(Q_strlen(in) + 1);
@ -435,7 +424,6 @@ char *CopyString(char *in)
return out; return out;
} }
/* <4c63> ../engine/cmd.c:521 */
void Cmd_Alias_f(void) void Cmd_Alias_f(void)
{ {
cmdalias_t *a; cmdalias_t *a;
@ -534,13 +522,11 @@ void Cmd_Alias_f(void)
a->value = CopyString(cmd); a->value = CopyString(cmd);
} }
/* <5079> ../engine/cmd.c:632 */
struct cmd_function_s *Cmd_GetFirstCmd(void) struct cmd_function_s *Cmd_GetFirstCmd(void)
{ {
return cmd_functions; return cmd_functions;
} }
/* <5091> ../engine/cmd.c:646 */
void Cmd_Init(void) void Cmd_Init(void)
{ {
Cmd_AddCommand("stuffcmds", Cmd_StuffCmds_f); Cmd_AddCommand("stuffcmds", Cmd_StuffCmds_f);
@ -552,7 +538,6 @@ void Cmd_Init(void)
Cmd_AddCommand("cmdlist", Cmd_CmdList_f); Cmd_AddCommand("cmdlist", Cmd_CmdList_f);
} }
/* <5521> ../engine/cmd.c:663 */
void Cmd_Shutdown(void) void Cmd_Shutdown(void)
{ {
for (int i = 0; i < cmd_argc; i++) for (int i = 0; i < cmd_argc; i++)
@ -566,7 +551,6 @@ void Cmd_Shutdown(void)
cmd_functions = NULL; // TODO: Check that memory from functions is released too cmd_functions = NULL; // TODO: Check that memory from functions is released too
} }
/* <5536> ../engine/cmd.c:677 */
int EXT_FUNC Cmd_Argc(void) int EXT_FUNC Cmd_Argc(void)
{ {
#ifndef SWDS #ifndef SWDS
@ -576,7 +560,6 @@ int EXT_FUNC Cmd_Argc(void)
return cmd_argc; return cmd_argc;
} }
/* <5547> ../engine/cmd.c:689 */
const char* EXT_FUNC Cmd_Argv(int arg) const char* EXT_FUNC Cmd_Argv(int arg)
{ {
#ifndef SWDS #ifndef SWDS
@ -590,7 +573,6 @@ const char* EXT_FUNC Cmd_Argv(int arg)
return ""; // TODO: Possibly better to return NULL here, but require to check all usages return ""; // TODO: Possibly better to return NULL here, but require to check all usages
} }
/* <5565> ../engine/cmd.c:703 */
const char* EXT_FUNC Cmd_Args(void) const char* EXT_FUNC Cmd_Args(void)
{ {
#ifndef SWDS #ifndef SWDS
@ -600,15 +582,10 @@ const char* EXT_FUNC Cmd_Args(void)
return cmd_args; return cmd_args;
} }
/* <5575> ../engine/cmd.c:715 */
/* /*
============
Cmd_TokenizeString
Parses the given string into command line tokens. Parses the given string into command line tokens.
Takes a null terminated string. Does not need to be \n terminated. Takes a null terminated string. Does not need to be \n terminated.
Breaks the string up into arg tokens. Breaks the string up into arg tokens.
============
*/ */
void EXT_FUNC Cmd_TokenizeString(char *text) void EXT_FUNC Cmd_TokenizeString(char *text)
{ {
@ -674,7 +651,6 @@ void EXT_FUNC Cmd_TokenizeString(char *text)
} }
} }
/* <55be> ../engine/cmd.c:773 */
NOXREF cmd_function_t *Cmd_FindCmd(char *cmd_name) NOXREF cmd_function_t *Cmd_FindCmd(char *cmd_name)
{ {
NOXREFCHECK; NOXREFCHECK;
@ -692,7 +668,6 @@ NOXREF cmd_function_t *Cmd_FindCmd(char *cmd_name)
return NULL; return NULL;
} }
/* <5611> ../engine/cmd.c:791 */
NOXREF cmd_function_t *Cmd_FindCmdPrev(char *cmd_name) NOXREF cmd_function_t *Cmd_FindCmdPrev(char *cmd_name)
{ {
NOXREFCHECK; NOXREFCHECK;
@ -740,7 +715,6 @@ void Cmd_InsertCommand(cmd_function_t *cmd)
*p = cmd; *p = cmd;
} }
/* <5664> ../engine/cmd.c:812 */
// Use this for engine inside call only, not from user code, because it doesn't alloc string for the name. // Use this for engine inside call only, not from user code, because it doesn't alloc string for the name.
void Cmd_AddCommand(char *cmd_name, xcommand_t function) void Cmd_AddCommand(char *cmd_name, xcommand_t function)
{ {
@ -774,7 +748,6 @@ void Cmd_AddCommand(char *cmd_name, xcommand_t function)
Cmd_InsertCommand(cmd); Cmd_InsertCommand(cmd);
} }
/* <5700> ../engine/cmd.c:891 */
// Use this for call from user code, because it alloc string for the name. // Use this for call from user code, because it alloc string for the name.
void Cmd_AddMallocCommand(char *cmd_name, xcommand_t function, int flag) void Cmd_AddMallocCommand(char *cmd_name, xcommand_t function, int flag)
{ {
@ -803,7 +776,6 @@ void Cmd_AddMallocCommand(char *cmd_name, xcommand_t function, int flag)
Cmd_InsertCommand(cmd); Cmd_InsertCommand(cmd);
} }
/* <5776> ../engine/cmd.c:934 */
NOXREF void Cmd_AddHUDCommand(char *cmd_name, xcommand_t function) NOXREF void Cmd_AddHUDCommand(char *cmd_name, xcommand_t function)
{ {
NOXREFCHECK; NOXREFCHECK;
@ -811,7 +783,6 @@ NOXREF void Cmd_AddHUDCommand(char *cmd_name, xcommand_t function)
Cmd_AddMallocCommand(cmd_name, function, FCMD_HUD_COMMAND); Cmd_AddMallocCommand(cmd_name, function, FCMD_HUD_COMMAND);
} }
/* <5824> ../engine/cmd.c:946 */
NOXREF void Cmd_AddWrapperCommand(char *cmd_name, xcommand_t function) NOXREF void Cmd_AddWrapperCommand(char *cmd_name, xcommand_t function)
{ {
NOXREFCHECK; NOXREFCHECK;
@ -819,13 +790,11 @@ NOXREF void Cmd_AddWrapperCommand(char *cmd_name, xcommand_t function)
Cmd_AddMallocCommand(cmd_name, function, FCMD_WRAPPER_COMMAND); Cmd_AddMallocCommand(cmd_name, function, FCMD_WRAPPER_COMMAND);
} }
/* <58d2> ../engine/cmd.c:960 */
void EXT_FUNC Cmd_AddGameCommand(char *cmd_name, xcommand_t function) void EXT_FUNC Cmd_AddGameCommand(char *cmd_name, xcommand_t function)
{ {
Cmd_AddMallocCommand(cmd_name, function, FCMD_GAME_COMMAND); Cmd_AddMallocCommand(cmd_name, function, FCMD_GAME_COMMAND);
} }
/* <5980> ../engine/cmd.c:970 */
void Cmd_RemoveMallocedCmds(int flag) void Cmd_RemoveMallocedCmds(int flag)
{ {
cmd_function_t *c, **p; cmd_function_t *c, **p;
@ -847,7 +816,6 @@ void Cmd_RemoveMallocedCmds(int flag)
} }
} }
/* <59f9> ../engine/cmd.c:1002 */
NOXREF void Cmd_RemoveHudCmds(void) NOXREF void Cmd_RemoveHudCmds(void)
{ {
NOXREFCHECK; NOXREFCHECK;
@ -855,19 +823,16 @@ NOXREF void Cmd_RemoveHudCmds(void)
Cmd_RemoveMallocedCmds(FCMD_HUD_COMMAND); Cmd_RemoveMallocedCmds(FCMD_HUD_COMMAND);
} }
/* <5a4c> ../engine/cmd.c:1012 */
void Cmd_RemoveGameCmds(void) void Cmd_RemoveGameCmds(void)
{ {
Cmd_RemoveMallocedCmds(FCMD_GAME_COMMAND); Cmd_RemoveMallocedCmds(FCMD_GAME_COMMAND);
} }
/* <5a9f> ../engine/cmd.c:1022 */
void Cmd_RemoveWrapperCmds(void) void Cmd_RemoveWrapperCmds(void)
{ {
Cmd_RemoveMallocedCmds(FCMD_WRAPPER_COMMAND); Cmd_RemoveMallocedCmds(FCMD_WRAPPER_COMMAND);
} }
/* <5af2> ../engine/cmd.c:1035 */
qboolean Cmd_Exists(const char *cmd_name) qboolean Cmd_Exists(const char *cmd_name)
{ {
cmd_function_t *cmd = cmd_functions; cmd_function_t *cmd = cmd_functions;
@ -885,7 +850,6 @@ qboolean Cmd_Exists(const char *cmd_name)
return FALSE; return FALSE;
} }
/* <5b30> ../engine/cmd.c:1055 */
NOXREF char *Cmd_CompleteCommand(char *search, int forward) NOXREF char *Cmd_CompleteCommand(char *search, int forward)
{ {
NOXREFCHECK; NOXREFCHECK;
@ -995,7 +959,6 @@ void EXT_FUNC Cmd_ExecuteString_internal(const char* cmdName, cmd_source_t src,
} }
} }
/* <5d4e> ../engine/cmd.c:1133 */
void Cmd_ExecuteString(char *text, cmd_source_t src) void Cmd_ExecuteString(char *text, cmd_source_t src)
{ {
cmd_source = src; cmd_source = src;
@ -1013,7 +976,6 @@ void Cmd_ExecuteString(char *text, cmd_source_t src)
g_RehldsHookchains.m_ExecuteServerStringCmd.callChain(Cmd_ExecuteString_internal, cmd_argv[0], src, cl); g_RehldsHookchains.m_ExecuteServerStringCmd.callChain(Cmd_ExecuteString_internal, cmd_argv[0], src, cl);
} }
/* <5c15> ../engine/cmd.c:1181 */
qboolean Cmd_ForwardToServerInternal(sizebuf_t *pBuf) qboolean Cmd_ForwardToServerInternal(sizebuf_t *pBuf)
{ {
const char *cmd_name = Cmd_Argv(0); const char *cmd_name = Cmd_Argv(0);
@ -1066,7 +1028,6 @@ qboolean Cmd_ForwardToServerInternal(sizebuf_t *pBuf)
return FALSE; return FALSE;
} }
/* <5cfd> ../engine/cmd.c:1247 */
void Cmd_ForwardToServer(void) void Cmd_ForwardToServer(void)
{ {
if (Q_stricmp(Cmd_Argv(0), "cmd") || Q_stricmp(Cmd_Argv(1), "dlfile")) if (Q_stricmp(Cmd_Argv(0), "cmd") || Q_stricmp(Cmd_Argv(1), "dlfile"))
@ -1075,13 +1036,11 @@ void Cmd_ForwardToServer(void)
} }
} }
/* <5f1b> ../engine/cmd.c:1258 */
qboolean Cmd_ForwardToServerUnreliable(void) qboolean Cmd_ForwardToServerUnreliable(void)
{ {
return Cmd_ForwardToServerInternal(&g_pcls.datagram); return Cmd_ForwardToServerInternal(&g_pcls.datagram);
} }
/* <5f35> ../engine/cmd.c:1273 */
// Returns the position (1 to argc-1) in the command's argument list // Returns the position (1 to argc-1) in the command's argument list
// where the given parameter apears, or 0 if not present. // where the given parameter apears, or 0 if not present.
NOXREF int Cmd_CheckParm(char *parm) NOXREF int Cmd_CheckParm(char *parm)
@ -1106,7 +1065,6 @@ NOXREF int Cmd_CheckParm(char *parm)
return 0; return 0;
} }
/* <4b17> ../engine/cmd.c:1301 */
void Cmd_CmdList_f(void) void Cmd_CmdList_f(void)
{ {
cmd_function_t *cmd; cmd_function_t *cmd;

12
rehlds/engine/cmodel.cpp
View File

@ -33,17 +33,12 @@ unsigned char *gPVS;
int gPVSRowBytes; int gPVSRowBytes;
unsigned char mod_novis[MODEL_MAX_PVS]; unsigned char mod_novis[MODEL_MAX_PVS];
/* <812a> ../engine/cmodel.c:23 */
void Mod_Init(void) void Mod_Init(void)
{ {
SW_Mod_Init(); SW_Mod_Init();
Q_memset(mod_novis, 255, MODEL_MAX_PVS); Q_memset(mod_novis, 255, MODEL_MAX_PVS);
} }
/* <813f> ../engine/cmodel.c:37 */
unsigned char *Mod_DecompressVis(unsigned char *in, model_t *model) unsigned char *Mod_DecompressVis(unsigned char *in, model_t *model)
{ {
static unsigned char decompressed[MODEL_MAX_PVS]; static unsigned char decompressed[MODEL_MAX_PVS];
@ -64,7 +59,6 @@ unsigned char *Mod_DecompressVis(unsigned char *in, model_t *model)
return decompressed; return decompressed;
} }
/* <824c> ../engine/cmodel.c:54 */
unsigned char *Mod_LeafPVS(mleaf_t *leaf, model_t *model) unsigned char *Mod_LeafPVS(mleaf_t *leaf, model_t *model)
{ {
if (leaf == model->leafs) if (leaf == model->leafs)
@ -81,7 +75,6 @@ unsigned char *Mod_LeafPVS(mleaf_t *leaf, model_t *model)
return CM_LeafPVS(leafnum); return CM_LeafPVS(leafnum);
} }
/* <8358> ../engine/cmodel.c:68 */
void CM_DecompressPVS(unsigned char *in, unsigned char *decompressed, int byteCount) void CM_DecompressPVS(unsigned char *in, unsigned char *decompressed, int byteCount)
{ {
int c; int c;
@ -119,7 +112,6 @@ void CM_DecompressPVS(unsigned char *in, unsigned char *decompressed, int byteCo
} }
} }
/* <8106> ../engine/cmodel.c:100 */
unsigned char *CM_LeafPVS(int leafnum) unsigned char *CM_LeafPVS(int leafnum)
{ {
if (gPVS) if (gPVS)
@ -129,7 +121,6 @@ unsigned char *CM_LeafPVS(int leafnum)
return mod_novis; return mod_novis;
} }
/* <83b7> ../engine/cmodel.c:109 */
unsigned char *CM_LeafPAS(int leafnum) unsigned char *CM_LeafPAS(int leafnum)
{ {
if (gPAS) if (gPAS)
@ -139,7 +130,6 @@ unsigned char *CM_LeafPAS(int leafnum)
return mod_novis; return mod_novis;
} }
/* <83ec> ../engine/cmodel.c:118 */
void CM_FreePAS(void) void CM_FreePAS(void)
{ {
if (gPAS) if (gPAS)
@ -150,7 +140,6 @@ void CM_FreePAS(void)
gPVS = 0; gPVS = 0;
} }
/* <83fd> ../engine/cmodel.c:139 */
void CM_CalcPAS(model_t *pModel) void CM_CalcPAS(model_t *pModel)
{ {
int rows, rowwords; int rows, rowwords;
@ -253,7 +242,6 @@ void CM_CalcPAS(model_t *pModel)
Con_DPrintf("Average leaves visible / audible / total: %i / %i / %i\n", vcount / count, acount / count, count); Con_DPrintf("Average leaves visible / audible / total: %i / %i / %i\n", vcount / count, acount / count, count);
} }
/* <858a> ../engine/cmodel.c:218 */
qboolean CM_HeadnodeVisible(mnode_t *node, unsigned char *visbits, int *first_visible_leafnum) qboolean CM_HeadnodeVisible(mnode_t *node, unsigned char *visbits, int *first_visible_leafnum)
{ {
int leafnum; int leafnum;

4
rehlds/engine/com_custom.cpp
View File

@ -28,8 +28,6 @@
#include "precompiled.h" #include "precompiled.h"
/* <99d0> ../engine/com_custom.c:19 */
void COM_ClearCustomizationList(customization_t *pHead, qboolean bCleanDecals) void COM_ClearCustomizationList(customization_t *pHead, qboolean bCleanDecals)
{ {
customization_s *pCurrent, *pNext; customization_s *pCurrent, *pNext;
@ -84,7 +82,6 @@ void COM_ClearCustomizationList(customization_t *pHead, qboolean bCleanDecals)
pHead->pNext = NULL; pHead->pNext = NULL;
} }
/* <9a75> ../engine/com_custom.c:88 */
qboolean COM_CreateCustomization(customization_t *pListHead, resource_t *pResource, int playernumber, int flags, customization_t **pCustomization, int *nLumps) qboolean COM_CreateCustomization(customization_t *pListHead, resource_t *pResource, int playernumber, int flags, customization_t **pCustomization, int *nLumps)
{ {
customization_t *pCust; // 91 customization_t *pCust; // 91
@ -176,7 +173,6 @@ CustomizationError:
return bError == FALSE; return bError == FALSE;
} }
/* <9b41> ../engine/com_custom.c:229 */
int COM_SizeofResourceList(resource_t *pList, resourceinfo_t *ri) int COM_SizeofResourceList(resource_t *pList, resourceinfo_t *ri)
{ {
resource_t *p; resource_t *p;

163
rehlds/engine/common.cpp
View File

@ -39,26 +39,17 @@ char* strcpy_safe(char* dst, char* src) {
return dst; return dst;
} }
/* <e875> ../engine/common.c:80 */
char *Info_Serverinfo(void) char *Info_Serverinfo(void)
{ {
return serverinfo; return serverinfo;
} }
#ifdef Q_functions #ifdef Q_functions
/* <e8ed> ../engine/common.c:123 */
NOBODY void Q_memset(void *dest, int fill, int count); NOBODY void Q_memset(void *dest, int fill, int count);
/* <eafe> ../engine/common.c:143 */
NOBODY void Q_memcpy(void *dest, const void *src, int count); NOBODY void Q_memcpy(void *dest, const void *src, int count);
/* <eb5c> ../engine/common.c:162 */
NOBODY int Q_memcmp(void *m1, void *m2, int count); NOBODY int Q_memcmp(void *m1, void *m2, int count);
/* <e6a5> ../engine/common.c:180 */
void Q_strcpy(char *dest, const char *src) void Q_strcpy(char *dest, const char *src)
{ {
char *c; char *c;
@ -75,10 +66,8 @@ void Q_strcpy(char *dest, const char *src)
*c = 0; *c = 0;
} }
/* <ebf7> ../engine/common.c:189 */
NOBODY void Q_strncpy(char *dest, const char *src, int count); NOBODY void Q_strncpy(char *dest, const char *src, int count);
/* <e67c> ../engine/common.c:203 */
int Q_strlen(const char *str) int Q_strlen(const char *str)
{ {
int result = 0; int result = 0;
@ -92,54 +81,26 @@ int Q_strlen(const char *str)
return result; return result;
} }
/* <ec7a> ../engine/common.c:219 */
NOBODY char *Q_strrchr(char *s, char c); NOBODY char *Q_strrchr(char *s, char c);
/* <ece5> ../engine/common.c:228 */
NOBODY void Q_strcat(char *dest, char *src); NOBODY void Q_strcat(char *dest, char *src);
/* <e832> ../engine/common.c:234 */
NOBODY int Q_strcmp(const char *s1, const char *s2); NOBODY int Q_strcmp(const char *s1, const char *s2);
/* <ed94> ../engine/common.c:252 */
NOBODY int Q_strncmp(const char *s1, const char *s2, int count); NOBODY int Q_strncmp(const char *s1, const char *s2, int count);
/* <eddd> ../engine/common.c:272 */
NOBODY int Q_strncasecmp(const char *s1, const char *s2, int n); NOBODY int Q_strncasecmp(const char *s1, const char *s2, int n);
/* <ee5e> ../engine/common.c:311 */
NOBODY int Q_strcasecmp(const char *s1, const char *s2); NOBODY int Q_strcasecmp(const char *s1, const char *s2);
/* <eee8> ../engine/common.c:316 */
NOBODY int Q_stricmp(const char *s1, const char *s2); NOBODY int Q_stricmp(const char *s1, const char *s2);
/* <ef7e> ../engine/common.c:321 */
NOBODY int Q_strnicmp(const char *s1, const char *s2, int n); NOBODY int Q_strnicmp(const char *s1, const char *s2, int n);
/* <effb> ../engine/common.c:326 */
NOBODY int Q_atoi(const char *str); NOBODY int Q_atoi(const char *str);
/* <f058> ../engine/common.c:385 */
NOBODY float Q_atof(const char *str); NOBODY float Q_atof(const char *str);
/* <f0d3> ../engine/common.c:460 */
NOBODY char *Q_strlwr(char *src); NOBODY char *Q_strlwr(char *src);
/* <f129> ../engine/common.c:475 */
NOBODY int Q_FileNameCmp(char *file1, char *file2); NOBODY int Q_FileNameCmp(char *file1, char *file2);
/* <f198> ../engine/common.c:495 */
NOBODY char *Q_strstr(const char *s1, const char *search); NOBODY char *Q_strstr(const char *s1, const char *search);
/* <f1d3> ../engine/common.c:502 */
NOBODY uint64 Q_strtoull(char *str); NOBODY uint64 Q_strtoull(char *str);
#endif // Q_functions #endif // Q_functions
#ifndef COM_Functions_region #ifndef COM_Functions_region
/* <e6ca> ../engine/common.c:550 */
unsigned char COM_Nibble(char c) unsigned char COM_Nibble(char c)
{ {
if (c >= '0' && c <= '9') if (c >= '0' && c <= '9')
@ -160,7 +121,6 @@ unsigned char COM_Nibble(char c)
return '0'; return '0';
} }
/* <f259> ../engine/common.c:580 */
void COM_HexConvert(const char *pszInput, int nInputLength, unsigned char *pOutput) void COM_HexConvert(const char *pszInput, int nInputLength, unsigned char *pOutput)
{ {
unsigned char *p; unsigned char *p;
@ -180,7 +140,6 @@ void COM_HexConvert(const char *pszInput, int nInputLength, unsigned char *pOutp
} }
} }
/* <f335> ../engine/common.c:597 */
NOXREF char *COM_BinPrintf(unsigned char *buf, int nLen) NOXREF char *COM_BinPrintf(unsigned char *buf, int nLen)
{ {
static char szReturn[4096]; static char szReturn[4096];
@ -200,7 +159,6 @@ NOXREF char *COM_BinPrintf(unsigned char *buf, int nLen)
return szReturn; return szReturn;
} }
/* <f400> ../engine/common.c:616 */
void COM_ExplainDisconnection(qboolean bPrint, char *fmt, ...) void COM_ExplainDisconnection(qboolean bPrint, char *fmt, ...)
{ {
va_list argptr; va_list argptr;
@ -220,7 +178,6 @@ void COM_ExplainDisconnection(qboolean bPrint, char *fmt, ...)
} }
} }
/* <f495> ../engine/common.c:636 */
NOXREF void COM_ExtendedExplainDisconnection(qboolean bPrint, char *fmt, ...) NOXREF void COM_ExtendedExplainDisconnection(qboolean bPrint, char *fmt, ...)
{ {
NOXREFCHECK; NOXREFCHECK;
@ -262,7 +219,6 @@ int (*LittleLong)(int l);
float (*BigFloat)(float l); float (*BigFloat)(float l);
float (*LittleFloat)(float l); float (*LittleFloat)(float l);
int LongSwap(int l) int LongSwap(int l)
{ {
return bswap(l); return bswap(l);
@ -310,17 +266,10 @@ float FloatNoSwap(float f)
#endif // Byte_Functions_region #endif // Byte_Functions_region
#ifndef MSG_Functions_region #ifndef MSG_Functions_region
/* // MESSAGE IO FUNCTIONS
============================================================================== // Handles byte ordering and avoids alignment errors
MESSAGE IO FUNCTIONS
Handles byte ordering and avoids alignment errors
==============================================================================
*/
int msg_badread; int msg_badread;
int msg_readcount; int msg_readcount;
@ -339,7 +288,7 @@ const uint32 BITTABLE[] =
0x00000000, 0x00000000,
}; };
const uint32 ROWBITTABLE[] = const uint32 ROWBITTABLE[] =
{ {
0x00000000, 0x00000001, 0x00000003, 0x00000007, 0x00000000, 0x00000001, 0x00000003, 0x00000007,
0x0000000F, 0x0000001F, 0x0000003F, 0x0000007F, 0x0000000F, 0x0000001F, 0x0000003F, 0x0000007F,
@ -365,7 +314,6 @@ const uint32 INVBITTABLE[] =
0xFFFFFFFF, 0xFFFFFFFF,
}; };
void MSG_WriteChar(sizebuf_t *sb, int c) void MSG_WriteChar(sizebuf_t *sb, int c)
{ {
unsigned char *buf = (unsigned char *)SZ_GetSpace(sb, 1); unsigned char *buf = (unsigned char *)SZ_GetSpace(sb, 1);
@ -442,11 +390,9 @@ void MSG_WriteUsercmd(sizebuf_t *buf, usercmd_t *to, usercmd_t *from)
MSG_EndBitWriting(buf); MSG_EndBitWriting(buf);
} }
typedef struct bf_write_s typedef struct bf_write_s
{ {
// For enhanced and safe bits writing functions
//For enhanced and safe bits writing functions
#if defined(REHLDS_FIXES) #if defined(REHLDS_FIXES)
#pragma pack(push, 1) #pragma pack(push, 1)
@ -461,13 +407,13 @@ typedef struct bf_write_s
int nCurOutputBit; int nCurOutputBit;
sizebuf_t *pbuf; sizebuf_t *pbuf;
#else //defined(REHLDS_FIXES) #else // defined(REHLDS_FIXES)
int nCurOutputBit; int nCurOutputBit;
unsigned char *pOutByte; unsigned char *pOutByte;
sizebuf_t *pbuf; sizebuf_t *pbuf;
#endif //defined(REHLDS_FIXES) #endif // defined(REHLDS_FIXES)
} bf_write_t; } bf_write_t;
typedef struct bf_read_s typedef struct bf_read_s
@ -491,7 +437,7 @@ void COM_BitOpsInit(void)
Q_memset(&bfread, 0, sizeof(bf_read_t)); Q_memset(&bfread, 0, sizeof(bf_read_t));
} }
//Enhanced and safe bits writing functions // Enhanced and safe bits writing functions
#if defined(REHLDS_FIXES) #if defined(REHLDS_FIXES)
void MSG_WBits_MaybeFlush() { void MSG_WBits_MaybeFlush() {
@ -751,7 +697,7 @@ void MSG_StartBitReading(sizebuf_t *buf)
bfread.pbuf = buf; bfread.pbuf = buf;
bfread.pInByte = &buf->data[msg_readcount]; bfread.pInByte = &buf->data[msg_readcount];
bfread.nMsgReadCount = msg_readcount + 1; bfread.nMsgReadCount = msg_readcount + 1;
if (msg_readcount + 1 > buf->cursize) if (msg_readcount + 1 > buf->cursize)
{ {
msg_badread = 1; msg_badread = 1;
@ -802,7 +748,7 @@ int MSG_ReadOneBit(void)
msg_badread = 1; msg_badread = 1;
} }
} }
return nValue; return nValue;
} }
@ -887,7 +833,7 @@ int MSG_ReadSBits(int numbits)
{ {
int nSignBit = MSG_ReadOneBit(); int nSignBit = MSG_ReadOneBit();
int result = MSG_ReadBits(numbits - 1); int result = MSG_ReadBits(numbits - 1);
if (nSignBit) if (nSignBit)
{ {
result = -result; result = -result;
@ -1265,7 +1211,6 @@ void MSG_ReadUsercmd(usercmd_t *to, usercmd_t* from)
#endif // MSG_Functions_region #endif // MSG_Functions_region
#ifndef SZ_Functions_region #ifndef SZ_Functions_region
void SZ_Alloc(const char *name, sizebuf_t *buf, int startsize) void SZ_Alloc(const char *name, sizebuf_t *buf, int startsize)
@ -1434,8 +1379,6 @@ unsigned char mungify_table3[] =
0x4A, 0x12, 0xA9, 0xB5 0x4A, 0x12, 0xA9, 0xB5
}; };
/* <1118a> ../engine/common.c:1808 */
NOXREF char *COM_SkipPath(char *pathname) NOXREF char *COM_SkipPath(char *pathname)
{ {
NOXREFCHECK; NOXREFCHECK;
@ -1451,7 +1394,6 @@ NOXREF char *COM_SkipPath(char *pathname)
return last; return last;
} }
/* <111c8> ../engine/common.c:1827 */
void COM_StripExtension(char *in, char *out) void COM_StripExtension(char *in, char *out)
{ {
char *c, *d = NULL; char *c, *d = NULL;
@ -1494,7 +1436,6 @@ void COM_StripExtension(char *in, char *out)
} }
} }
/* <11285> ../engine/common.c:1855 */
char *COM_FileExtension(char *in) char *COM_FileExtension(char *in)
{ {
static char exten[MAX_PATH]; static char exten[MAX_PATH];
@ -1532,8 +1473,7 @@ char *COM_FileExtension(char *in)
return exten; return exten;
} }
/* <112d2> ../engine/common.c:1877 */ // Fills "out" with the file name without path and extension.
/// Fills "out" with the file name without path and extension.
void COM_FileBase(const char *in, char *out) void COM_FileBase(const char *in, char *out)
{ {
const char *start, *end; const char *start, *end;
@ -1560,7 +1500,6 @@ void COM_FileBase(const char *in, char *out)
out[len] = 0; out[len] = 0;
} }
/* <11396> ../engine/common.c:1922 */
void COM_DefaultExtension(char *path, char *extension) void COM_DefaultExtension(char *path, char *extension)
{ {
char *src; char *src;
@ -1579,13 +1518,11 @@ void COM_DefaultExtension(char *path, char *extension)
Q_strcat(path, extension); Q_strcat(path, extension);
} }
/* <11407> ../engine/common.c:1948 */
void COM_UngetToken(void) void COM_UngetToken(void)
{ {
s_com_token_unget = 1; s_com_token_unget = 1;
} }
/* <1141c> ../engine/common.c:1960 */
char *COM_Parse(char *data) char *COM_Parse(char *data)
{ {
int c; int c;
@ -1689,7 +1626,6 @@ inquotes:
return data; return data;
} }
/* <11495> ../engine/common.c:2049 */
char *COM_ParseLine(char *data) char *COM_ParseLine(char *data)
{ {
#ifndef REHLDS_FIXES #ifndef REHLDS_FIXES
@ -1754,7 +1690,6 @@ char *COM_ParseLine(char *data)
return data; return data;
} }
/* <114e2> ../engine/common.c:2100 */
int COM_TokenWaiting(char *buffer) int COM_TokenWaiting(char *buffer)
{ {
char *p; char *p;
@ -1771,7 +1706,6 @@ int COM_TokenWaiting(char *buffer)
return 0; return 0;
} }
/* <1151e> ../engine/common.c:2125 */
int COM_CheckParm(char *parm) int COM_CheckParm(char *parm)
{ {
int i; int i;
@ -1792,7 +1726,6 @@ int COM_CheckParm(char *parm)
return 0; return 0;
} }
/* <11592> ../engine/common.c:2145 */
void COM_InitArgv(int argc, char *argv[]) void COM_InitArgv(int argc, char *argv[])
{ {
qboolean safe = 0; qboolean safe = 0;
@ -1853,7 +1786,6 @@ void COM_InitArgv(int argc, char *argv[])
com_argv = largv; com_argv = largv;
} }
/* <11628> ../engine/common.c:2204 */
void COM_Init(char *basedir) void COM_Init(char *basedir)
{ {
unsigned short swaptest = 1; unsigned short swaptest = 1;
@ -1882,7 +1814,6 @@ void COM_Init(char *basedir)
COM_BitOpsInit(); COM_BitOpsInit();
} }
/* <116ca> ../engine/common.c:2242 */
char *va(char *format, ...) char *va(char *format, ...)
{ {
va_list argptr; va_list argptr;
@ -1898,7 +1829,6 @@ char *va(char *format, ...)
return string[current]; return string[current];
} }
/* <11743> ../engine/common.c:2267 */
NOXREF char *vstr(vec_t *v) NOXREF char *vstr(vec_t *v)
{ {
NOXREFCHECK; NOXREFCHECK;
@ -1913,7 +1843,6 @@ NOXREF char *vstr(vec_t *v)
return string[idx]; return string[idx];
} }
/* <117aa> ../engine/common.c:2280 */
NOXREF int memsearch(unsigned char *start, int count, int search) NOXREF int memsearch(unsigned char *start, int count, int search)
{ {
NOXREFCHECK; NOXREFCHECK;
@ -1929,7 +1858,6 @@ NOXREF int memsearch(unsigned char *start, int count, int search)
return -1; return -1;
} }
/* <11838> ../engine/common.c:2308 */
NOXREF void COM_WriteFile(char *filename, void *data, int len) NOXREF void COM_WriteFile(char *filename, void *data, int len)
{ {
NOXREFCHECK; NOXREFCHECK;
@ -1955,7 +1883,6 @@ NOXREF void COM_WriteFile(char *filename, void *data, int len)
} }
} }
/* <e859> ../engine/common.c:2338 */
void COM_FixSlashes(char *pname) void COM_FixSlashes(char *pname)
{ {
while (*pname) while (*pname)
@ -1976,7 +1903,6 @@ void COM_FixSlashes(char *pname)
} }
} }
/* <11804> ../engine/common.c:2362 */
void COM_CreatePath(char *path) void COM_CreatePath(char *path)
{ {
char *ofs; char *ofs;
@ -1999,7 +1925,6 @@ void COM_CreatePath(char *path)
} }
} }
/* <1193e> ../engine/common.c:2388 */
NOXREF void COM_CopyFile(char *netpath, char *cachepath) NOXREF void COM_CopyFile(char *netpath, char *cachepath)
{ {
NOXREFCHECK; NOXREFCHECK;
@ -2010,7 +1935,7 @@ NOXREF void COM_CopyFile(char *netpath, char *cachepath)
FileHandle_t out; FileHandle_t out;
FileHandle_t in = FS_Open(netpath, "rb"); FileHandle_t in = FS_Open(netpath, "rb");
if (!in) if (!in)
{ {
return; return;
@ -2036,7 +1961,6 @@ NOXREF void COM_CopyFile(char *netpath, char *cachepath)
FS_Close(out); FS_Close(out);
} }
/* <119f8> ../engine/common.c:2426 */
NOXREF int COM_ExpandFilename(char *filename) NOXREF int COM_ExpandFilename(char *filename)
{ {
NOXREFCHECK; NOXREFCHECK;
@ -2048,7 +1972,6 @@ NOXREF int COM_ExpandFilename(char *filename)
return *filename != 0; return *filename != 0;
} }
/* <11a36> ../engine/common.c:2446 */
int EXT_FUNC COM_FileSize(char *filename) int EXT_FUNC COM_FileSize(char *filename)
{ {
FileHandle_t fp; FileHandle_t fp;
@ -2064,7 +1987,6 @@ int EXT_FUNC COM_FileSize(char *filename)
return iSize; return iSize;
} }
/* <11a83> ../engine/common.c:2472 */
unsigned char* EXT_FUNC COM_LoadFile(const char *path, int usehunk, int *pLength) unsigned char* EXT_FUNC COM_LoadFile(const char *path, int usehunk, int *pLength)
{ {
char base[33]; char base[33];
@ -2151,7 +2073,6 @@ unsigned char* EXT_FUNC COM_LoadFile(const char *path, int usehunk, int *pLength
return buf; return buf;
} }
/* <11b0f> ../engine/common.c:2538 */
void EXT_FUNC COM_FreeFile(void *buffer) void EXT_FUNC COM_FreeFile(void *buffer)
{ {
#ifndef SWDS #ifndef SWDS
@ -2164,7 +2085,6 @@ void EXT_FUNC COM_FreeFile(void *buffer)
} }
} }
/* <11b39> ../engine/common.c:2554 */
void COM_CopyFileChunk(FileHandle_t dst, FileHandle_t src, int nSize) void COM_CopyFileChunk(FileHandle_t dst, FileHandle_t src, int nSize)
{ {
int copysize; int copysize;
@ -2185,7 +2105,6 @@ void COM_CopyFileChunk(FileHandle_t dst, FileHandle_t src, int nSize)
FS_Flush(dst); FS_Flush(dst);
} }
/* <11ba1> ../engine/common.c:2589 */
NOXREF unsigned char *COM_LoadFileLimit(char *path, int pos, int cbmax, int *pcbread, FileHandle_t *phFile) NOXREF unsigned char *COM_LoadFileLimit(char *path, int pos, int cbmax, int *pcbread, FileHandle_t *phFile)
{ {
FileHandle_t hFile; FileHandle_t hFile;
@ -2245,26 +2164,22 @@ NOXREF unsigned char *COM_LoadFileLimit(char *path, int pos, int cbmax, int *pcb
return buf; return buf;
} }
/* <11c60> ../engine/common.c:2647 */
unsigned char *COM_LoadHunkFile(char *path) unsigned char *COM_LoadHunkFile(char *path)
{ {
return COM_LoadFile(path, 1, NULL); return COM_LoadFile(path, 1, NULL);
} }
/* <11c8e> ../engine/common.c:2652 */
unsigned char *COM_LoadTempFile(char *path, int *pLength) unsigned char *COM_LoadTempFile(char *path, int *pLength)
{ {
return COM_LoadFile(path, 2, pLength); return COM_LoadFile(path, 2, pLength);
} }
/* <11ccb> ../engine/common.c:2657 */
void EXT_FUNC COM_LoadCacheFile(char *path, struct cache_user_s *cu) void EXT_FUNC COM_LoadCacheFile(char *path, struct cache_user_s *cu)
{ {
loadcache = cu; loadcache = cu;
COM_LoadFile(path, 3, 0); COM_LoadFile(path, 3, 0);
} }
/* <11d09> ../engine/common.c:2664 */
NOXREF unsigned char *COM_LoadStackFile(char *path, void *buffer, int bufsize, int *length) NOXREF unsigned char *COM_LoadStackFile(char *path, void *buffer, int bufsize, int *length)
{ {
NOXREFCHECK; NOXREFCHECK;
@ -2275,13 +2190,11 @@ NOXREF unsigned char *COM_LoadStackFile(char *path, void *buffer, int bufsize, i
return COM_LoadFile(path, 4, length); return COM_LoadFile(path, 4, length);
} }
/* <11d6f> ../engine/common.c:2682 */
void COM_Shutdown(void) void COM_Shutdown(void)
{ {
// Do nothing. // Do nothing.
} }
/* <11d84> ../engine/common.c:2693 */
NOXREF void COM_AddAppDirectory(char *pszBaseDir, const char *appName) NOXREF void COM_AddAppDirectory(char *pszBaseDir, const char *appName)
{ {
NOXREFCHECK; NOXREFCHECK;
@ -2289,7 +2202,6 @@ NOXREF void COM_AddAppDirectory(char *pszBaseDir, const char *appName)
FS_AddSearchPath(pszBaseDir, "PLATFORM"); FS_AddSearchPath(pszBaseDir, "PLATFORM");
} }
/* <11dbc> ../engine/common.c:2707 */
void COM_AddDefaultDir(char *pszDir) void COM_AddDefaultDir(char *pszDir)
{ {
if (pszDir && *pszDir) if (pszDir && *pszDir)
@ -2298,7 +2210,6 @@ void COM_AddDefaultDir(char *pszDir)
} }
} }
/* <11de5> ../engine/common.c:2715 */
void COM_StripTrailingSlash(char *ppath) void COM_StripTrailingSlash(char *ppath)
{ {
int len = Q_strlen(ppath); int len = Q_strlen(ppath);
@ -2312,7 +2223,6 @@ void COM_StripTrailingSlash(char *ppath)
} }
} }
/* <11e34> ../engine/common.c:2729 */
void COM_ParseDirectoryFromCmd(const char *pCmdName, char *pDirName, const char *pDefault) void COM_ParseDirectoryFromCmd(const char *pCmdName, char *pDirName, const char *pDefault)
{ {
const char *pParameter = NULL; const char *pParameter = NULL;
@ -2349,7 +2259,6 @@ void COM_ParseDirectoryFromCmd(const char *pCmdName, char *pDirName, const char
} }
// TODO: finish me! // TODO: finish me!
/* <11f12> ../engine/common.c:2766 */
qboolean COM_SetupDirectories(void) qboolean COM_SetupDirectories(void)
{ {
char pDirName[512]; char pDirName[512];
@ -2363,14 +2272,12 @@ qboolean COM_SetupDirectories(void)
if (FileSystem_SetGameDirectory(pDirName, (const char *)(com_gamedir[0] != 0 ? com_gamedir : 0))) if (FileSystem_SetGameDirectory(pDirName, (const char *)(com_gamedir[0] != 0 ? com_gamedir : 0)))
{ {
Info_SetValueForStarKey(Info_Serverinfo(), "*gamedir", com_gamedir, MAX_INFO_STRING); Info_SetValueForStarKey(Info_Serverinfo(), "*gamedir", com_gamedir, MAX_INFO_STRING);
return 1; return 1;
} }
return 0; return 0;
} }
/* <e637> ../engine/common.c:2796 */
void COM_CheckPrintMap(dheader_t *header, const char *mapname, qboolean bShowOutdated) void COM_CheckPrintMap(dheader_t *header, const char *mapname, qboolean bShowOutdated)
{ {
if (header->version == BSPVERSION) if (header->version == BSPVERSION)
@ -2389,7 +2296,6 @@ void COM_CheckPrintMap(dheader_t *header, const char *mapname, qboolean bShowOut
} }
} }
/* <11f41> ../engine/common.c:2821 */
void COM_ListMaps(char *pszSubString) void COM_ListMaps(char *pszSubString)
{ {
dheader_t header; dheader_t header;
@ -2442,7 +2348,6 @@ void COM_ListMaps(char *pszSubString)
} }
} }
/* <1202d> ../engine/common.c:2873 */
void COM_Log(char *pszFile, char *fmt, ...) void COM_Log(char *pszFile, char *fmt, ...)
{ {
char *pfilename; char *pfilename;
@ -2474,13 +2379,11 @@ void COM_Log(char *pszFile, char *fmt, ...)
} }
} }
/* <120a6> ../engine/common.c:2900 */
unsigned char* EXT_FUNC COM_LoadFileForMe(char *filename, int *pLength) unsigned char* EXT_FUNC COM_LoadFileForMe(char *filename, int *pLength)
{ {
return COM_LoadFile(filename, 5, pLength); return COM_LoadFile(filename, 5, pLength);
} }
/* <120e3> ../engine/common.c:2905 */
int EXT_FUNC COM_CompareFileTime(char *filename1, char *filename2, int *iCompare) int EXT_FUNC COM_CompareFileTime(char *filename1, char *filename2, int *iCompare)
{ {
int ft1; int ft1;
@ -2512,7 +2415,6 @@ int EXT_FUNC COM_CompareFileTime(char *filename1, char *filename2, int *iCompare
return 0; return 0;
} }
/* <12165> ../engine/common.c:2930 */
void EXT_FUNC COM_GetGameDir(char *szGameDir) void EXT_FUNC COM_GetGameDir(char *szGameDir)
{ {
if (szGameDir) if (szGameDir)
@ -2521,7 +2423,6 @@ void EXT_FUNC COM_GetGameDir(char *szGameDir)
} }
} }
/* <1218f> ../engine/common.c:2947 */
int COM_EntsForPlayerSlots(int nPlayers) int COM_EntsForPlayerSlots(int nPlayers)
{ {
int numedicts = gmodinfo.num_edicts; int numedicts = gmodinfo.num_edicts;
@ -2540,7 +2441,6 @@ int COM_EntsForPlayerSlots(int nPlayers)
return (numedicts + 15 * (nPlayers - 1)); return (numedicts + 15 * (nPlayers - 1));
} }
/* <12270> ../engine/common.c:2965 */
void COM_NormalizeAngles(vec_t *angles) void COM_NormalizeAngles(vec_t *angles)
{ {
int i; int i;
@ -2558,16 +2458,8 @@ void COM_NormalizeAngles(vec_t *angles)
} }
} }
/* // Anti-proxy/aimbot obfuscation code
================ // COM_UnMunge should reversably fixup the data
COM_Munge funcs
Anti-proxy/aimbot obfuscation code
COM_UnMunge should reversably fixup the data
================
*/
/* <12320> ../engine/common.c:3018 */
void COM_Munge(unsigned char *data, int len, int seq) void COM_Munge(unsigned char *data, int len, int seq)
{ {
int i; int i;
@ -2598,7 +2490,6 @@ void COM_Munge(unsigned char *data, int len, int seq)
} }
} }
/* <123f7> ../engine/common.c:3060 */
void COM_UnMunge(unsigned char *data, int len, int seq) void COM_UnMunge(unsigned char *data, int len, int seq)
{ {
int i; int i;
@ -2696,7 +2587,7 @@ void COM_Munge2(unsigned char *data, int len, int seq)
} }
} }
#else // REHLDS_FIXES #else // REHLDS_FIXES
/* <124de> ../engine/common.c:3104 */
void COM_Munge2(unsigned char *data, int len, int seq) void COM_Munge2(unsigned char *data, int len, int seq)
{ {
int i; int i;
@ -2795,7 +2686,7 @@ void COM_UnMunge2(unsigned char *data, int len, int seq)
} }
} }
#else // REHLDS_FIXES #else // REHLDS_FIXES
/* <125b5> ../engine/common.c:3146 */
void COM_UnMunge2(unsigned char *data, int len, int seq) void COM_UnMunge2(unsigned char *data, int len, int seq)
{ {
int i; int i;
@ -2827,7 +2718,6 @@ void COM_UnMunge2(unsigned char *data, int len, int seq)
} }
#endif // REHLDS_FIXES #endif // REHLDS_FIXES
/* <1269c> ../engine/common.c:3190 */
void COM_Munge3(unsigned char *data, int len, int seq) void COM_Munge3(unsigned char *data, int len, int seq)
{ {
int i; int i;
@ -2858,7 +2748,6 @@ void COM_Munge3(unsigned char *data, int len, int seq)
} }
} }
/* <12773> ../engine/common.c:3232 */
NOXREF void COM_UnMunge3(unsigned char *data, int len, int seq) NOXREF void COM_UnMunge3(unsigned char *data, int len, int seq)
{ {
NOXREFCHECK; NOXREFCHECK;
@ -2891,29 +2780,27 @@ NOXREF void COM_UnMunge3(unsigned char *data, int len, int seq)
} }
} }
/* <e5a9> ../engine/common.c:3272 */
typedef struct typedef struct
{ {
unsigned char chunkID[4]; unsigned char chunkID[4];
long int chunkSize; long chunkSize;
short int wFormatTag; short wFormatTag;
short unsigned int wChannels; unsigned short wChannels;
long unsigned int dwSamplesPerSec; unsigned long dwSamplesPerSec;
long unsigned int dwAvgBytesPerSec; unsigned long dwAvgBytesPerSec;
short unsigned int wBlockAlign; unsigned short wBlockAlign;
short unsigned int wBitsPerSample; unsigned short wBitsPerSample;
} FormatChunk; } FormatChunk;
#define WAVE_HEADER_LENGTH 128 #define WAVE_HEADER_LENGTH 128
/* <1285a> ../engine/common.c:3287 */
unsigned int EXT_FUNC COM_GetApproxWavePlayLength(const char *filepath) unsigned int EXT_FUNC COM_GetApproxWavePlayLength(const char *filepath)
{ {
char buf[WAVE_HEADER_LENGTH + 1]; char buf[WAVE_HEADER_LENGTH + 1];
int filelength; int filelength;
FileHandle_t hFile; FileHandle_t hFile;
FormatChunk format; FormatChunk format;
hFile = FS_Open(filepath, "rb"); hFile = FS_Open(filepath, "rb");
if (hFile) if (hFile)

5
rehlds/engine/consistency.h
View File

@ -34,10 +34,9 @@
#define MAX_CONSISTENCY_LIST 512 #define MAX_CONSISTENCY_LIST 512
/* <7508> ../engine/consistency.h:9 */
typedef struct consistency_s typedef struct consistency_s
{ {
char * filename; char *filename;
int issound; int issound;
int orig_index; int orig_index;
int value; int value;
@ -46,4 +45,4 @@ typedef struct consistency_s
float maxs[3]; float maxs[3];
} consistency_t; } consistency_t;
#endif // CONSISTENCY_H #endif // CONSISTENCY_H

23
rehlds/engine/crc.cpp
View File

@ -28,7 +28,6 @@
#include "precompiled.h" #include "precompiled.h"
static const uint32 pulCRCTable[256] = static const uint32 pulCRCTable[256] =
{ {
0x00000000, 0x77073096, 0xee0e612c, 0x990951ba, 0x00000000, 0x77073096, 0xee0e612c, 0x990951ba,
@ -97,20 +96,16 @@ static const uint32 pulCRCTable[256] =
0xb40bbe37, 0xc30c8ea1, 0x5a05df1b, 0x2d02ef8d 0xb40bbe37, 0xc30c8ea1, 0x5a05df1b, 0x2d02ef8d
}; };
/* <193b9> ../engine/crc.c:86 */
void EXT_FUNC CRC32_Init(CRC32_t *pulCRC) void EXT_FUNC CRC32_Init(CRC32_t *pulCRC)
{ {
*pulCRC = -1; *pulCRC = -1;
} }
/* <193d9> ../engine/crc.c:91 */
CRC32_t EXT_FUNC CRC32_Final(CRC32_t pulCRC) CRC32_t EXT_FUNC CRC32_Final(CRC32_t pulCRC)
{ {
return ~pulCRC; return ~pulCRC;
} }
/* <19453> ../engine/crc.c:96 */
void EXT_FUNC CRC32_ProcessByte(CRC32_t *pulCRC, unsigned char ch) void EXT_FUNC CRC32_ProcessByte(CRC32_t *pulCRC, unsigned char ch)
{ {
CRC32_t ulCrc = *pulCRC; CRC32_t ulCrc = *pulCRC;
@ -118,7 +113,6 @@ void EXT_FUNC CRC32_ProcessByte(CRC32_t *pulCRC, unsigned char ch)
*pulCRC = ulCrc; *pulCRC = ulCrc;
} }
/* <19496> ../engine/crc.c:106 */
void EXT_FUNC CRC32_ProcessBuffer(CRC32_t *pulCRC, void *pBuffer, int nBuffer) void EXT_FUNC CRC32_ProcessBuffer(CRC32_t *pulCRC, void *pBuffer, int nBuffer)
{ {
CRC32_t ulCrc = *pulCRC; CRC32_t ulCrc = *pulCRC;
@ -132,7 +126,6 @@ void EXT_FUNC CRC32_ProcessBuffer(CRC32_t *pulCRC, void *pBuffer, int nBuffer)
*pulCRC = ulCrc; *pulCRC = ulCrc;
} }
/* <19527> ../engine/crc.c:247 */
byte COM_BlockSequenceCRCByte(byte *base, int length, int sequence) byte COM_BlockSequenceCRCByte(byte *base, int length, int sequence)
{ {
byte *p; byte *p;
@ -157,7 +150,6 @@ byte COM_BlockSequenceCRCByte(byte *base, int length, int sequence)
return CRC32_Final(crc); return CRC32_Final(crc);
} }
/* <195e1> ../engine/crc.c:292 */
NOXREF BOOL CRC_File(CRC32_t *crcvalue, char *pszFileName) NOXREF BOOL CRC_File(CRC32_t *crcvalue, char *pszFileName)
{ {
FileHandle_t fp; FileHandle_t fp;
@ -200,7 +192,6 @@ NOXREF BOOL CRC_File(CRC32_t *crcvalue, char *pszFileName)
return 1; return 1;
} }
/* <1966e> ../engine/crc.c:354 */
int CRC_MapFile(CRC32_t *crcvalue, char *pszFileName) int CRC_MapFile(CRC32_t *crcvalue, char *pszFileName)
{ {
FileHandle_t fp; FileHandle_t fp;
@ -212,7 +203,7 @@ int CRC_MapFile(CRC32_t *crcvalue, char *pszFileName)
int nSize; int nSize;
lump_t *curLump; lump_t *curLump;
int32 startOfs; int32 startOfs;
int nLumpID; int nLumpID;
nLumpID = 0; nLumpID = 0;
if (Q_stricmp(com_gamedir, "bshift") == 0) if (Q_stricmp(com_gamedir, "bshift") == 0)
@ -290,7 +281,7 @@ static unsigned char PADDING[64] =
#define F(x, y, z) (((x) & (y)) | ((~x) & (z))) #define F(x, y, z) (((x) & (y)) | ((~x) & (z)))
#define G(x, y, z) (((x) & (z)) | ((y) & (~z))) #define G(x, y, z) (((x) & (z)) | ((y) & (~z)))
#define H(x, y, z) ((x) ^ (y) ^ (z)) #define H(x, y, z) ((x) ^ (y) ^ (z))
#define I(x, y, z) ((y) ^ ((x) | (~z))) #define I(x, y, z) ((y) ^ ((x) | (~z)))
/* ROTATE_LEFT rotates x left n bits */ /* ROTATE_LEFT rotates x left n bits */
#define ROTATE_LEFT(x, n) (((x) << (n)) | ((x) >> (32-(n)))) #define ROTATE_LEFT(x, n) (((x) << (n)) | ((x) >> (32-(n))))
@ -323,7 +314,6 @@ static unsigned char PADDING[64] =
} }
/* <1974c> ../engine/crc.c:455 */
void MD5Init(MD5Context_t *ctx) void MD5Init(MD5Context_t *ctx)
{ {
ctx->bits[0] = ctx->bits[1] = 0; ctx->bits[0] = ctx->bits[1] = 0;
@ -335,7 +325,6 @@ void MD5Init(MD5Context_t *ctx)
ctx->buf[3] = 0x10325476; ctx->buf[3] = 0x10325476;
} }
/* <19841> ../engine/crc.c:473 */
void MD5Update(MD5Context_t *ctx, const unsigned char *buf, unsigned int len) void MD5Update(MD5Context_t *ctx, const unsigned char *buf, unsigned int len)
{ {
uint32 in[16]; uint32 in[16];
@ -373,7 +362,6 @@ void MD5Update(MD5Context_t *ctx, const unsigned char *buf, unsigned int len)
} }
} }
/* <197ea> ../engine/crc.c:528 */
void MD5Final(unsigned char digest[16], MD5Context_t *ctx) void MD5Final(unsigned char digest[16], MD5Context_t *ctx)
{ {
uint32 in[16]; uint32 in[16];
@ -410,7 +398,6 @@ void MD5Final(unsigned char digest[16], MD5Context_t *ctx)
} }
} }
/* <19769> ../engine/crc.c:592 */
void MD5Transform(unsigned int buf[4], const unsigned int in[16]) void MD5Transform(unsigned int buf[4], const unsigned int in[16])
{ {
uint32 a = buf[0], b = buf[1], c = buf[2], d = buf[3]; uint32 a = buf[0], b = buf[1], c = buf[2], d = buf[3];
@ -509,13 +496,12 @@ void MD5Transform(unsigned int buf[4], const unsigned int in[16])
buf[3] += d; buf[3] += d;
} }
/* <198b8> ../engine/crc.c:686 */
BOOL MD5_Hash_File(unsigned char digest[16], char *pszFileName, BOOL bUsefopen, BOOL bSeed, unsigned int seed[4]) BOOL MD5_Hash_File(unsigned char digest[16], char *pszFileName, BOOL bUsefopen, BOOL bSeed, unsigned int seed[4])
{ {
FileHandle_t fp = (FileHandle_t)FS_OpenPathID(pszFileName, "rb", "GAMECONFIG"); FileHandle_t fp = (FileHandle_t)FS_OpenPathID(pszFileName, "rb", "GAMECONFIG");
if (!fp) if (!fp)
fp = FS_Open(pszFileName, "rb"); fp = FS_Open(pszFileName, "rb");
if (!fp) if (!fp)
return 0; return 0;
@ -526,7 +512,7 @@ BOOL MD5_Hash_File(unsigned char digest[16], char *pszFileName, BOOL bUsefopen,
return 0; return 0;
} }
MD5Context_t ctx; MD5Context_t ctx;
Q_memset(&ctx, 0, sizeof(ctx)); Q_memset(&ctx, 0, sizeof(ctx));
MD5Init(&ctx); MD5Init(&ctx);
@ -565,7 +551,6 @@ BOOL MD5_Hash_File(unsigned char digest[16], char *pszFileName, BOOL bUsefopen,
return 0; return 0;
} }
/* <1998b> ../engine/crc.c:762 */
char *MD5_Print(unsigned char hash[16]) char *MD5_Print(unsigned char hash[16])
{ {
static char szReturn[64]; static char szReturn[64];

24
rehlds/engine/cvar.cpp
View File

@ -28,8 +28,6 @@
#include "precompiled.h" #include "precompiled.h"
/* /*
All cvar names are case insensitive! Values not. All cvar names are case insensitive! Values not.
*/ */
@ -37,8 +35,6 @@
cvar_t *cvar_vars; cvar_t *cvar_vars;
char cvar_null_string[] = ""; char cvar_null_string[] = "";
/* <1853e> ../engine/cvar.c:26 */
void Cvar_Init(void) void Cvar_Init(void)
{ {
#ifndef SWDS #ifndef SWDS
@ -46,14 +42,12 @@ void Cvar_Init(void)
#endif #endif
} }
/* <18552> ../engine/cvar.c:30 */
void Cvar_Shutdown(void) void Cvar_Shutdown(void)
{ {
// TODO: Check memory releasing // TODO: Check memory releasing
cvar_vars = NULL; cvar_vars = NULL;
} }
/* <18566> ../engine/cvar.c:40 */
cvar_t *Cvar_FindVar(const char *var_name) cvar_t *Cvar_FindVar(const char *var_name)
{ {
cvar_t *var; cvar_t *var;
@ -70,7 +64,6 @@ cvar_t *Cvar_FindVar(const char *var_name)
return var; return var;
} }
/* <185b6> ../engine/cvar.c:58 */
NOXREF cvar_t *Cvar_FindPrevVar(const char *var_name) NOXREF cvar_t *Cvar_FindPrevVar(const char *var_name)
{ {
NOXREFCHECK; NOXREFCHECK;
@ -85,7 +78,6 @@ NOXREF cvar_t *Cvar_FindPrevVar(const char *var_name)
return NULL; return NULL;
} }
/* <18606> ../engine/cvar.c:78 */
float Cvar_VariableValue(const char *var_name) float Cvar_VariableValue(const char *var_name)
{ {
cvar_t *var = Cvar_FindVar(var_name); cvar_t *var = Cvar_FindVar(var_name);
@ -98,7 +90,6 @@ float Cvar_VariableValue(const char *var_name)
return 0.0f; return 0.0f;
} }
/* <18666> ../engine/cvar.c:94 */
NOXREF int Cvar_VariableInt(const char *var_name) NOXREF int Cvar_VariableInt(const char *var_name)
{ {
NOXREFCHECK; NOXREFCHECK;
@ -113,7 +104,6 @@ NOXREF int Cvar_VariableInt(const char *var_name)
return 0; return 0;
} }
/* <186c6> ../engine/cvar.c:110 */
char *Cvar_VariableString(const char *var_name) char *Cvar_VariableString(const char *var_name)
{ {
cvar_t *var = Cvar_FindVar(var_name); cvar_t *var = Cvar_FindVar(var_name);
@ -126,7 +116,6 @@ char *Cvar_VariableString(const char *var_name)
return cvar_null_string; return cvar_null_string;
} }
/* <1872a> ../engine/cvar.c:126 */
NOXREF const char *Cvar_CompleteVariable(const char *search, int forward) NOXREF const char *Cvar_CompleteVariable(const char *search, int forward)
{ {
NOXREFCHECK; NOXREFCHECK;
@ -185,7 +174,6 @@ NOXREF const char *Cvar_CompleteVariable(const char *search, int forward)
return NULL; return NULL;
} }
/* <18805> ../engine/cvar.c:198 */
void EXT_FUNC Cvar_DirectSet_internal(struct cvar_s *var, const char *value) void EXT_FUNC Cvar_DirectSet_internal(struct cvar_s *var, const char *value)
{ {
if (!var || !value) if (!var || !value)
@ -315,7 +303,6 @@ void Cvar_DirectSet(struct cvar_s *var, const char *value)
g_RehldsHookchains.m_Cvar_DirectSet.callChain(Cvar_DirectSet_internal, var, value); g_RehldsHookchains.m_Cvar_DirectSet.callChain(Cvar_DirectSet_internal, var, value);
} }
/* <188e9> ../engine/cvar.c:347 */
void Cvar_Set(const char *var_name, const char *value) void Cvar_Set(const char *var_name, const char *value)
{ {
cvar_t *var = Cvar_FindVar(var_name); cvar_t *var = Cvar_FindVar(var_name);
@ -329,7 +316,6 @@ void Cvar_Set(const char *var_name, const char *value)
Cvar_DirectSet(var, value); Cvar_DirectSet(var, value);
} }
/* <1893e> ../engine/cvar.c:365 */
void Cvar_SetValue(const char *var_name, float value) void Cvar_SetValue(const char *var_name, float value)
{ {
char val[32]; char val[32];
@ -351,7 +337,6 @@ void Cvar_SetValue(const char *var_name, float value)
Cvar_Set(var_name, val); Cvar_Set(var_name, val);
} }
/* <189df> ../engine/cvar.c:391 */
void EXT_FUNC Cvar_RegisterVariable(cvar_t *variable) void EXT_FUNC Cvar_RegisterVariable(cvar_t *variable)
{ {
char *oldstr; char *oldstr;
@ -400,7 +385,6 @@ void EXT_FUNC Cvar_RegisterVariable(cvar_t *variable)
cvar_vars = dummyvar.next; cvar_vars = dummyvar.next;
} }
/* <18a7e> ../engine/cvar.c:452 */
NOXREF void Cvar_RemoveHudCvars(void) NOXREF void Cvar_RemoveHudCvars(void)
{ {
NOXREFCHECK; NOXREFCHECK;
@ -428,7 +412,6 @@ NOXREF void Cvar_RemoveHudCvars(void)
} }
} }
/* <18ac9> ../engine/cvar.c:499 */
// Returns first token if there is more than one, else returns NULL. // Returns first token if there is more than one, else returns NULL.
const char *Cvar_IsMultipleTokens(const char *varname) const char *Cvar_IsMultipleTokens(const char *varname)
{ {
@ -466,7 +449,6 @@ const char *Cvar_IsMultipleTokens(const char *varname)
return firstToken; // multiple tokens, return first one return firstToken; // multiple tokens, return first one
} }
/* <18b6e> ../engine/cvar.c:542 */
qboolean Cvar_Command(void) qboolean Cvar_Command(void)
{ {
cvar_t *v; cvar_t *v;
@ -510,7 +492,6 @@ qboolean Cvar_Command(void)
return FALSE; return FALSE;
} }
/* <18ca4> ../engine/cvar.c:601 */
NOXREF void Cvar_WriteVariables(FileHandle_t f) NOXREF void Cvar_WriteVariables(FileHandle_t f)
{ {
NOXREFCHECK; NOXREFCHECK;
@ -526,7 +507,6 @@ NOXREF void Cvar_WriteVariables(FileHandle_t f)
} }
} }
/* <18cdc> ../engine/cvar.c:627 */
void Cmd_CvarListPrintCvar(cvar_t *var, FileHandle_t f) void Cmd_CvarListPrintCvar(cvar_t *var, FileHandle_t f)
{ {
char szOutstr[256]; char szOutstr[256];
@ -569,7 +549,6 @@ void Cmd_CvarListPrintCvar(cvar_t *var, FileHandle_t f)
} }
} }
/* <18d23> ../engine/cvar.c:671 */
void Cmd_CvarList_f(void) void Cmd_CvarList_f(void)
{ {
cvar_t *var; cvar_t *var;
@ -695,7 +674,6 @@ void Cmd_CvarList_f(void)
} }
} }
/* <18e0f> ../engine/cvar.c:806 */
NOXREF int Cvar_CountServerVariables(void) NOXREF int Cvar_CountServerVariables(void)
{ {
NOXREFCHECK; NOXREFCHECK;
@ -713,7 +691,6 @@ NOXREF int Cvar_CountServerVariables(void)
return i; return i;
} }
/* <18e4a> ../engine/cvar.c:829 */
void Cvar_UnlinkExternals(void) void Cvar_UnlinkExternals(void)
{ {
cvar_t *pVar; cvar_t *pVar;
@ -737,7 +714,6 @@ void Cvar_UnlinkExternals(void)
} }
} }
/* <18e8a> ../engine/cvar.c:853 */
void Cvar_CmdInit(void) void Cvar_CmdInit(void)
{ {
Cmd_AddCommand("cvarlist", Cmd_CvarList_f); Cmd_AddCommand("cvarlist", Cmd_CvarList_f);

3
rehlds/engine/decal.h
View File

@ -48,14 +48,12 @@
#define OFFSET_DATAEXTRA_SIZE 8 #define OFFSET_DATAEXTRA_SIZE 8
#endif #endif
/* <1fb9e> ../engine/decal.h:33 */
typedef struct decalname_s typedef struct decalname_s
{ {
char name[16]; char name[16];
unsigned char ucFlags; unsigned char ucFlags;
} decalname_t; } decalname_t;
/* <1fc17> ../engine/decals.c:449 */
typedef struct lumplist_s typedef struct lumplist_s
{ {
lumpinfo_t *lump; lumpinfo_t *lump;
@ -110,4 +108,5 @@ qboolean Draw_ValidateCustomLogo(cachewad_t *wad, unsigned char *data, lumpinfo_
qboolean Draw_CacheLoadFromCustom(char *clean, cachewad_t *wad, void *raw, int rawsize, cachepic_t *pic); qboolean Draw_CacheLoadFromCustom(char *clean, cachewad_t *wad, void *raw, int rawsize, cachepic_t *pic);
NOXREF int Draw_CacheIndex(cachewad_t *wad, char *path); NOXREF int Draw_CacheIndex(cachewad_t *wad, char *path);
NOXREF int Draw_CacheFindIndex(cachewad_t *wad, char *path); NOXREF int Draw_CacheFindIndex(cachewad_t *wad, char *path);
#endif // DECAL_H #endif // DECAL_H

37
rehlds/engine/decals.cpp
View File

@ -29,7 +29,7 @@
#include "precompiled.h" #include "precompiled.h"
cachewad_t *decal_wad; cachewad_t *decal_wad;
cachewad_t *menu_wad; // NOXREF cachewad_t *menu_wad; // NOXREF, reference of client-side code
char szCustName[10]; char szCustName[10];
char decal_names[MAX_DECALS][16]; char decal_names[MAX_DECALS][16];
@ -37,7 +37,6 @@ char decal_names[MAX_DECALS][16];
qboolean m_bDrawInitialized; qboolean m_bDrawInitialized;
qboolean gfCustomBuild; qboolean gfCustomBuild;
/* <20209> ../engine/decals.c:37 */
void Draw_Shutdown(void) void Draw_Shutdown(void)
{ {
if (m_bDrawInitialized) if (m_bDrawInitialized)
@ -50,7 +49,6 @@ void Draw_Shutdown(void)
} }
} }
/* <201ee> ../engine/decals.c:59 */
void Draw_DecalShutdown(void) void Draw_DecalShutdown(void)
{ {
Draw_FreeWad(decal_wad); Draw_FreeWad(decal_wad);
@ -59,7 +57,6 @@ void Draw_DecalShutdown(void)
decal_wad = NULL; decal_wad = NULL;
} }
/* <1ff6d> ../engine/decals.c:69 */
void Draw_AllocateCacheSpace(cachewad_t *wad, int cacheMax, int tempWad) void Draw_AllocateCacheSpace(cachewad_t *wad, int cacheMax, int tempWad)
{ {
int len = sizeof(cachepic_t) * cacheMax; int len = sizeof(cachepic_t) * cacheMax;
@ -70,7 +67,6 @@ void Draw_AllocateCacheSpace(cachewad_t *wad, int cacheMax, int tempWad)
#endif #endif
} }
/* <1ffa4> ../engine/decals.c:80 */
void Draw_CacheWadInitFromFile(FileHandle_t hFile, int len, char *name, int cacheMax, cachewad_t *wad) void Draw_CacheWadInitFromFile(FileHandle_t hFile, int len, char *name, int cacheMax, cachewad_t *wad)
{ {
lumpinfo_t *lump_p; lumpinfo_t *lump_p;
@ -102,7 +98,6 @@ void Draw_CacheWadInitFromFile(FileHandle_t hFile, int len, char *name, int cach
Draw_CacheWadHandler(wad, NULL, 0); Draw_CacheWadHandler(wad, NULL, 0);
} }
/* <20067> ../engine/decals.c:113 */
void Draw_CacheWadInit(char *name, int cacheMax, cachewad_t *wad) void Draw_CacheWadInit(char *name, int cacheMax, cachewad_t *wad)
{ {
int len; int len;
@ -114,7 +109,6 @@ void Draw_CacheWadInit(char *name, int cacheMax, cachewad_t *wad)
FS_Close(hFile); FS_Close(hFile);
} }
/* <1fd66> ../engine/decals.c:127 */
qboolean Draw_CustomCacheWadInit(int cacheMax, cachewad_t *wad, void *raw, int nFileSize) qboolean Draw_CustomCacheWadInit(int cacheMax, cachewad_t *wad, void *raw, int nFileSize)
{ {
lumpinfo_t *lump_p; lumpinfo_t *lump_p;
@ -173,7 +167,6 @@ qboolean Draw_CustomCacheWadInit(int cacheMax, cachewad_t *wad, void *raw, int n
return TRUE; return TRUE;
} }
/* <1d0f8> ../engine/draw.c:154 */
void Draw_MiptexTexture(cachewad_t *wad, unsigned char *data) void Draw_MiptexTexture(cachewad_t *wad, unsigned char *data)
{ {
texture_t *tex; texture_t *tex;
@ -244,14 +237,12 @@ void Draw_MiptexTexture(cachewad_t *wad, unsigned char *data)
#endif // SWDS #endif // SWDS
} }
/* <20165> ../engine/decals.c:218 */
void Draw_CacheWadHandler(cachewad_t *wad, PFNCACHE fn, int extraDataSize) void Draw_CacheWadHandler(cachewad_t *wad, PFNCACHE fn, int extraDataSize)
{ {
wad->pfnCacheBuild = fn; wad->pfnCacheBuild = fn;
wad->cacheExtra = extraDataSize; wad->cacheExtra = extraDataSize;
} }
/* <20192> ../engine/decals.c:230 */
void Draw_FreeWad(cachewad_t *pWad) void Draw_FreeWad(cachewad_t *pWad)
{ {
int i; int i;
@ -300,7 +291,6 @@ void Draw_FreeWad(cachewad_t *pWad)
} }
} }
/* <2021e> ../engine/decals.c:292 */
NOXREF void Draw_DecalSetName(int decal, char *name) NOXREF void Draw_DecalSetName(int decal, char *name)
{ {
//Used Host_Frame -> CL_ReadPackets -> CL_ProcessFile -> CL_PrecacheResources -> Draw_DecalSetName //Used Host_Frame -> CL_ReadPackets -> CL_ProcessFile -> CL_PrecacheResources -> Draw_DecalSetName
@ -312,7 +302,6 @@ NOXREF void Draw_DecalSetName(int decal, char *name)
decal_names[decal][len] = 0; decal_names[decal][len] = 0;
} }
/* <20299> ../engine/decals.c:305 */
NOXREF int Draw_DecalIndex(int id) NOXREF int Draw_DecalIndex(int id)
{ {
//Used hw -> CL_Restore //Used hw -> CL_Restore
@ -329,7 +318,6 @@ NOXREF int Draw_DecalIndex(int id)
return Draw_CacheIndex(decal_wad, tmp); return Draw_CacheIndex(decal_wad, tmp);
} }
/* <1fd08> ../engine/decals.c:324 */
int Draw_DecalCount(void) int Draw_DecalCount(void)
{ {
if (decal_wad) if (decal_wad)
@ -337,7 +325,6 @@ int Draw_DecalCount(void)
return 0; return 0;
} }
/* <2033e> ../engine/decals.c:336 */
int Draw_DecalSize(int number) int Draw_DecalSize(int number)
{ {
if (decal_wad) if (decal_wad)
@ -348,7 +335,6 @@ int Draw_DecalSize(int number)
return 0; return 0;
} }
/* <1fd17> ../engine/decals.c:347 */
const char *Draw_DecalName(int number) const char *Draw_DecalName(int number)
{ {
if (decal_wad) if (decal_wad)
@ -359,7 +345,6 @@ const char *Draw_DecalName(int number)
return NULL; return NULL;
} }
/* <20d78> ../engine/decals.c:358 */
NOXREF texture_t *Draw_DecalTexture(int index) NOXREF texture_t *Draw_DecalTexture(int index)
{ {
texture_t *retval; texture_t *retval;
@ -380,7 +365,6 @@ NOXREF texture_t *Draw_DecalTexture(int index)
return retval; return retval;
} }
/* <1fdda> ../engine/decals.c:405 */
int Draw_CacheByIndex(cachewad_t *wad, int nIndex, int playernum) int Draw_CacheByIndex(cachewad_t *wad, int nIndex, int playernum)
{ {
int i; int i;
@ -402,7 +386,6 @@ int Draw_CacheByIndex(cachewad_t *wad, int nIndex, int playernum)
return i; return i;
} }
/* <203d0> ../engine/decals.c:428 */
NOXREF int Draw_DecalIndexFromName(char *name) NOXREF int Draw_DecalIndexFromName(char *name)
{ {
char tmpName[16]; char tmpName[16];
@ -420,7 +403,6 @@ NOXREF int Draw_DecalIndexFromName(char *name)
return 0; return 0;
} }
/* <2041b> ../engine/decals.c:459 */
void Decal_ReplaceOrAppendLump(lumplist_t **ppList, lumpinfo_t *lump, qboolean bsecondlump) void Decal_ReplaceOrAppendLump(lumplist_t **ppList, lumpinfo_t *lump, qboolean bsecondlump)
{ {
lumplist_t *p; lumplist_t *p;
@ -445,7 +427,6 @@ void Decal_ReplaceOrAppendLump(lumplist_t **ppList, lumpinfo_t *lump, qboolean b
*ppList = p; *ppList = p;
} }
/* <1fcb4> ../engine/decals.c:493 */
int Decal_CountLumps(lumplist_t *plist) int Decal_CountLumps(lumplist_t *plist)
{ {
int c = 0; int c = 0;
@ -458,13 +439,11 @@ int Decal_CountLumps(lumplist_t *plist)
return c; return c;
} }
/* <1fce8> ../engine/decals.c:507 */
int Decal_SizeLumps(lumplist_t *plist) int Decal_SizeLumps(lumplist_t *plist)
{ {
return (sizeof(lumpinfo_t) * Decal_CountLumps(plist)); return (sizeof(lumpinfo_t) * Decal_CountLumps(plist));
} }
/* <2050f> ../engine/decals.c:512 */
void Decal_MergeInDecals(cachewad_t *pwad, const char *pathID) void Decal_MergeInDecals(cachewad_t *pwad, const char *pathID)
{ {
int i; int i;
@ -539,7 +518,6 @@ void Decal_MergeInDecals(cachewad_t *pwad, const char *pathID)
Mem_Free(pwad); Mem_Free(pwad);
} }
/* <20779> ../engine/decals.c:622 */
void Decal_Init(void) void Decal_Init(void)
{ {
int i; int i;
@ -584,7 +562,6 @@ void Decal_Init(void)
} }
} }
/* <20c56> ../engine/decals.c:673 */
qboolean CustomDecal_Validate(void *raw, int nFileSize) qboolean CustomDecal_Validate(void *raw, int nFileSize)
{ {
qboolean bret = FALSE; qboolean bret = FALSE;
@ -602,7 +579,6 @@ qboolean CustomDecal_Validate(void *raw, int nFileSize)
return bret; return bret;
} }
/* <1fe34> ../engine/decals.c:694 */
qboolean CustomDecal_Init(struct cachewad_s *wad, void *raw, int nFileSize, int playernum) qboolean CustomDecal_Init(struct cachewad_s *wad, void *raw, int nFileSize, int playernum)
{ {
qboolean bret = Draw_CustomCacheWadInit(16, wad, raw, nFileSize); qboolean bret = Draw_CustomCacheWadInit(16, wad, raw, nFileSize);
@ -615,7 +591,6 @@ qboolean CustomDecal_Init(struct cachewad_s *wad, void *raw, int nFileSize, int
return bret; return bret;
} }
/* <20964> ../engine/decals.c:717 */
NOXREF void *Draw_CacheGet(cachewad_t *wad, int index) NOXREF void *Draw_CacheGet(cachewad_t *wad, int index)
{ {
int i; int i;
@ -659,7 +634,6 @@ NOXREF void *Draw_CacheGet(cachewad_t *wad, int index)
return dat; return dat;
} }
/* <20ba5> ../engine/decals.c:778 */
void *Draw_CustomCacheGet(cachewad_t *wad, void *raw, int rawsize, int index) void *Draw_CustomCacheGet(cachewad_t *wad, void *raw, int rawsize, int index)
{ {
void *pdata; void *pdata;
@ -687,7 +661,6 @@ void *Draw_CustomCacheGet(cachewad_t *wad, void *raw, int rawsize, int index)
return pdata; return pdata;
} }
/* <208ab> ../engine/decals.c:822 */
NOXREF qboolean Draw_CacheReload(cachewad_t *wad, int i, lumpinfo_t *pLump, cachepic_t *pic, char *clean, char *path) NOXREF qboolean Draw_CacheReload(cachewad_t *wad, int i, lumpinfo_t *pLump, cachepic_t *pic, char *clean, char *path)
{ {
int len; int len;
@ -697,7 +670,7 @@ NOXREF qboolean Draw_CacheReload(cachewad_t *wad, int i, lumpinfo_t *pLump, cach
if (wad->numpaths < 1) if (wad->numpaths < 1)
hFile = FS_Open(wad->name, "rb"); hFile = FS_Open(wad->name, "rb");
else else
hFile = FS_OpenPathID(wad->name, "rb", wad->basedirs[wad->lumppathindices[i]]); hFile = FS_OpenPathID(wad->name, "rb", wad->basedirs[wad->lumppathindices[i]]);
if (!hFile) if (!hFile)
return FALSE; return FALSE;
@ -725,7 +698,6 @@ NOXREF qboolean Draw_CacheReload(cachewad_t *wad, int i, lumpinfo_t *pLump, cach
return TRUE; return TRUE;
} }
/* <20a15> ../engine/decals.c:871 */
qboolean Draw_ValidateCustomLogo(cachewad_t *wad, unsigned char *data, lumpinfo_t *lump) qboolean Draw_ValidateCustomLogo(cachewad_t *wad, unsigned char *data, lumpinfo_t *lump)
{ {
texture_t tex; texture_t tex;
@ -785,7 +757,6 @@ qboolean Draw_ValidateCustomLogo(cachewad_t *wad, unsigned char *data, lumpinfo_
return TRUE; return TRUE;
} }
/* <20aec> ../engine/decals.c:942 */
qboolean Draw_CacheLoadFromCustom(char *clean, cachewad_t *wad, void *raw, int rawsize, cachepic_t *pic) qboolean Draw_CacheLoadFromCustom(char *clean, cachewad_t *wad, void *raw, int rawsize, cachepic_t *pic)
{ {
int idx; int idx;
@ -816,14 +787,13 @@ qboolean Draw_CacheLoadFromCustom(char *clean, cachewad_t *wad, void *raw, int r
szCustName[6] = 0; szCustName[6] = 0;
if (wad->pfnCacheBuild) if (wad->pfnCacheBuild)
wad->pfnCacheBuild(wad, buf); wad->pfnCacheBuild(wad, buf);
gfCustomBuild = FALSE; gfCustomBuild = FALSE;
return TRUE; return TRUE;
} }
return FALSE; return FALSE;
} }
/* <20257> ../engine/decals.c:999 */
NOXREF int Draw_CacheIndex(cachewad_t *wad, char *path) NOXREF int Draw_CacheIndex(cachewad_t *wad, char *path)
{ {
int i; int i;
@ -845,7 +815,6 @@ NOXREF int Draw_CacheIndex(cachewad_t *wad, char *path)
return i; return i;
} }
/* <20e1e> ../engine/decals.c:1025 */
NOXREF int Draw_CacheFindIndex(cachewad_t *wad, char *path) NOXREF int Draw_CacheFindIndex(cachewad_t *wad, char *path)
{ {
cachepic_t *pic = wad->cache; cachepic_t *pic = wad->cache;

57
rehlds/engine/delta.cpp
View File

@ -28,24 +28,20 @@
#include "precompiled.h" #include "precompiled.h"
#ifndef Defines_and_Variables_region #ifndef Defines_and_Variables_region
/* <23bb1> ../engine/delta.c:47 */
typedef struct delta_link_s typedef struct delta_link_s
{ {
delta_link_t *next; delta_link_t *next;
delta_description_t *delta; delta_description_t *delta;
} delta_link_t; } delta_link_t;
/* <23be5> ../engine/delta.c:53 */
typedef struct delta_definition_s typedef struct delta_definition_s
{ {
char *fieldName; char *fieldName;
int fieldOffset; int fieldOffset;
} delta_definition_t; } delta_definition_t;
/* <23c19> ../engine/delta.c:59 */
typedef struct delta_definition_list_s typedef struct delta_definition_list_s
{ {
delta_definition_list_t *next; delta_definition_list_t *next;
@ -54,7 +50,6 @@ typedef struct delta_definition_list_s
delta_definition_t *pdefinition; delta_definition_t *pdefinition;
} delta_definition_list_t; } delta_definition_list_t;
/* <23c69> ../engine/delta.c:67 */
typedef struct delta_registry_s typedef struct delta_registry_s
{ {
delta_registry_t *next; delta_registry_t *next;
@ -62,7 +57,6 @@ typedef struct delta_registry_s
delta_t *pdesc; delta_t *pdesc;
} delta_registry_t; } delta_registry_t;
delta_definition_list_t *g_defs; delta_definition_list_t *g_defs;
delta_encoder_t *g_encoders; delta_encoder_t *g_encoders;
delta_registry_t *g_deltaregistry; delta_registry_t *g_deltaregistry;
@ -119,6 +113,7 @@ static delta_definition_t g_EventDataDefinition[] =
DELTA_DEF(event_args_s, bparam2), DELTA_DEF(event_args_s, bparam2),
DELTA_DEF(event_args_s, ducking), DELTA_DEF(event_args_s, ducking),
}; };
static delta_definition_t g_EntityDataDefinition[] = static delta_definition_t g_EntityDataDefinition[] =
{ {
DELTA_DEF(entity_state_s, startpos[0]), DELTA_DEF(entity_state_s, startpos[0]),
@ -209,6 +204,7 @@ static delta_definition_t g_EntityDataDefinition[] =
DELTA_DEF(entity_state_s, vuser4[1]), DELTA_DEF(entity_state_s, vuser4[1]),
DELTA_DEF(entity_state_s, vuser4[2]), DELTA_DEF(entity_state_s, vuser4[2]),
}; };
static delta_definition_t g_UsercmdDataDefinition[] = static delta_definition_t g_UsercmdDataDefinition[] =
{ {
DELTA_DEF(usercmd_s, lerp_msec), DELTA_DEF(usercmd_s, lerp_msec),
@ -228,6 +224,7 @@ static delta_definition_t g_UsercmdDataDefinition[] =
DELTA_DEF(usercmd_s, impact_position[1]), DELTA_DEF(usercmd_s, impact_position[1]),
DELTA_DEF(usercmd_s, impact_position[2]), DELTA_DEF(usercmd_s, impact_position[2]),
}; };
static delta_definition_t g_WeaponDataDefinition[] = static delta_definition_t g_WeaponDataDefinition[] =
{ {
DELTA_DEF(weapon_data_s, m_iId), DELTA_DEF(weapon_data_s, m_iId),
@ -253,6 +250,7 @@ static delta_definition_t g_WeaponDataDefinition[] =
DELTA_DEF(weapon_data_s, fuser3), DELTA_DEF(weapon_data_s, fuser3),
DELTA_DEF(weapon_data_s, fuser4), DELTA_DEF(weapon_data_s, fuser4),
}; };
static delta_definition_t g_ClientDataDefinition[] = static delta_definition_t g_ClientDataDefinition[] =
{ {
DELTA_DEF(clientdata_s, origin[0]), DELTA_DEF(clientdata_s, origin[0]),
@ -315,8 +313,6 @@ static delta_definition_t g_ClientDataDefinition[] =
#endif #endif
/* <23f5d> ../engine/delta.c:346 */
delta_description_t *DELTA_FindField(delta_t *pFields, const char *pszField) delta_description_t *DELTA_FindField(delta_t *pFields, const char *pszField)
{ {
int fieldCount = pFields->fieldCount; int fieldCount = pFields->fieldCount;
@ -334,7 +330,6 @@ delta_description_t *DELTA_FindField(delta_t *pFields, const char *pszField)
return NULL; return NULL;
} }
/* <23fd7> ../engine/delta.c:370 */
int EXT_FUNC DELTA_FindFieldIndex(struct delta_s *pFields, const char *fieldname) int EXT_FUNC DELTA_FindFieldIndex(struct delta_s *pFields, const char *fieldname)
{ {
int fieldCount = pFields->fieldCount; int fieldCount = pFields->fieldCount;
@ -352,7 +347,6 @@ int EXT_FUNC DELTA_FindFieldIndex(struct delta_s *pFields, const char *fieldname
return -1; return -1;
} }
/* <24032> ../engine/delta.c:393 */
void EXT_FUNC DELTA_SetField(struct delta_s *pFields, const char *fieldname) void EXT_FUNC DELTA_SetField(struct delta_s *pFields, const char *fieldname)
{ {
#if defined(REHLDS_OPT_PEDANTIC) || defined(REHLDS_FIXES) #if defined(REHLDS_OPT_PEDANTIC) || defined(REHLDS_FIXES)
@ -370,7 +364,6 @@ void EXT_FUNC DELTA_SetField(struct delta_s *pFields, const char *fieldname)
#endif #endif
} }
/* <240b2> ../engine/delta.c:411 */
void EXT_FUNC DELTA_UnsetField(struct delta_s *pFields, const char *fieldname) void EXT_FUNC DELTA_UnsetField(struct delta_s *pFields, const char *fieldname)
{ {
#if defined(REHLDS_OPT_PEDANTIC) || defined(REHLDS_FIXES) #if defined(REHLDS_OPT_PEDANTIC) || defined(REHLDS_FIXES)
@ -388,7 +381,6 @@ void EXT_FUNC DELTA_UnsetField(struct delta_s *pFields, const char *fieldname)
#endif #endif
} }
/* <24132> ../engine/delta.c:429 */
void EXT_FUNC DELTA_SetFieldByIndex(struct delta_s *pFields, int fieldNumber) void EXT_FUNC DELTA_SetFieldByIndex(struct delta_s *pFields, int fieldNumber)
{ {
#if defined(REHLDS_OPT_PEDANTIC) || defined(REHLDS_FIXES) #if defined(REHLDS_OPT_PEDANTIC) || defined(REHLDS_FIXES)
@ -398,7 +390,6 @@ void EXT_FUNC DELTA_SetFieldByIndex(struct delta_s *pFields, int fieldNumber)
#endif #endif
} }
/* <2416a> ../engine/delta.c:441 */
void EXT_FUNC DELTA_UnsetFieldByIndex(struct delta_s *pFields, int fieldNumber) void EXT_FUNC DELTA_UnsetFieldByIndex(struct delta_s *pFields, int fieldNumber)
{ {
#if defined(REHLDS_OPT_PEDANTIC) || defined(REHLDS_FIXES) #if defined(REHLDS_OPT_PEDANTIC) || defined(REHLDS_FIXES)
@ -408,7 +399,6 @@ void EXT_FUNC DELTA_UnsetFieldByIndex(struct delta_s *pFields, int fieldNumber)
#endif #endif
} }
/* <23cc4> ../engine/delta.c:453 */
void DELTA_ClearFlags(delta_t *pFields) void DELTA_ClearFlags(delta_t *pFields)
{ {
int i; int i;
@ -419,7 +409,6 @@ void DELTA_ClearFlags(delta_t *pFields)
} }
} }
/* <241d2> ../engine/delta.c:473 */
int DELTA_TestDelta(unsigned char *from, unsigned char *to, delta_t *pFields) int DELTA_TestDelta(unsigned char *from, unsigned char *to, delta_t *pFields)
{ {
#if defined(REHLDS_OPT_PEDANTIC) || defined(REHLDS_FIXES) #if defined(REHLDS_OPT_PEDANTIC) || defined(REHLDS_FIXES)
@ -502,7 +491,6 @@ int DELTA_TestDelta(unsigned char *from, unsigned char *to, delta_t *pFields)
#endif #endif
} }
/* <24309> ../engine/delta.c:602 */
int DELTA_CountSendFields(delta_t *pFields) int DELTA_CountSendFields(delta_t *pFields)
{ {
int i, c; int i, c;
@ -519,7 +507,6 @@ int DELTA_CountSendFields(delta_t *pFields)
return c; return c;
} }
/* <24382> ../engine/delta.c:629 */
void DELTA_MarkSendFields(unsigned char *from, unsigned char *to, delta_t *pFields) void DELTA_MarkSendFields(unsigned char *from, unsigned char *to, delta_t *pFields)
{ {
int i; int i;
@ -580,7 +567,6 @@ void DELTA_MarkSendFields(unsigned char *from, unsigned char *to, delta_t *pFiel
pFields->conditionalencode(pFields, from, to); pFields->conditionalencode(pFields, from, to);
} }
/* <2448d> ../engine/delta.c:738 */
void DELTA_SetSendFlagBits(delta_t *pFields, int *bits, int *bytecount) void DELTA_SetSendFlagBits(delta_t *pFields, int *bits, int *bytecount)
{ {
delta_description_t *pTest; delta_description_t *pTest;
@ -615,12 +601,11 @@ qboolean DELTA_IsFieldMarked(delta_t* pFields, int fieldNumber)
{ {
#if defined(REHLDS_OPT_PEDANTIC) || defined(REHLDS_FIXES) #if defined(REHLDS_OPT_PEDANTIC) || defined(REHLDS_FIXES)
return DELTAJit_IsFieldMarked(pFields, fieldNumber); return DELTAJit_IsFieldMarked(pFields, fieldNumber);
#else #else
return pFields->pdd[fieldNumber].flags & FDT_MARK; return pFields->pdd[fieldNumber].flags & FDT_MARK;
#endif #endif
} }
/* <2456d> ../engine/delta.c:782 */
void DELTA_WriteMarkedFields(unsigned char *from, unsigned char *to, delta_t *pFields) void DELTA_WriteMarkedFields(unsigned char *from, unsigned char *to, delta_t *pFields)
{ {
int i; int i;
@ -736,7 +721,6 @@ void DELTA_WriteMarkedFields(unsigned char *from, unsigned char *to, delta_t *pF
} }
} }
/* <2467e> ../engine/delta.c:924 */
qboolean DELTA_CheckDelta(unsigned char *from, unsigned char *to, delta_t *pFields) qboolean DELTA_CheckDelta(unsigned char *from, unsigned char *to, delta_t *pFields)
{ {
qboolean sendfields; qboolean sendfields;
@ -748,11 +732,10 @@ qboolean DELTA_CheckDelta(unsigned char *from, unsigned char *to, delta_t *pFiel
DELTA_MarkSendFields(from, to, pFields); DELTA_MarkSendFields(from, to, pFields);
sendfields = DELTA_CountSendFields(pFields); sendfields = DELTA_CountSendFields(pFields);
#endif #endif
return sendfields; return sendfields;
} }
/* <247f5> ../engine/delta.c:949 */
NOINLINE qboolean DELTA_WriteDelta(unsigned char *from, unsigned char *to, qboolean force, delta_t *pFields, void(*callback)(void)) NOINLINE qboolean DELTA_WriteDelta(unsigned char *from, unsigned char *to, qboolean force, delta_t *pFields, void(*callback)(void))
{ {
qboolean sendfields; qboolean sendfields;
@ -808,7 +791,6 @@ qboolean _DELTA_WriteDelta(unsigned char *from, unsigned char *to, qboolean forc
} }
/* <24aa0> ../engine/delta.c:1010 */
int DELTA_ParseDelta(unsigned char *from, unsigned char *to, delta_t *pFields) int DELTA_ParseDelta(unsigned char *from, unsigned char *to, delta_t *pFields)
{ {
delta_description_t *pTest; delta_description_t *pTest;
@ -1013,7 +995,6 @@ int DELTA_ParseDelta(unsigned char *from, unsigned char *to, delta_t *pFields)
return MSG_CurrentBit() - startbit; return MSG_CurrentBit() - startbit;
} }
/* <24c50> ../engine/delta.c:1276 */
void EXT_FUNC DELTA_AddEncoder(char *name, void(*conditionalencode)(struct delta_s *, const unsigned char *, const unsigned char *)) void EXT_FUNC DELTA_AddEncoder(char *name, void(*conditionalencode)(struct delta_s *, const unsigned char *, const unsigned char *))
{ {
delta_encoder_t *p = (delta_encoder_t *)Mem_ZeroMalloc(sizeof(delta_encoder_t)); delta_encoder_t *p = (delta_encoder_t *)Mem_ZeroMalloc(sizeof(delta_encoder_t));
@ -1023,7 +1004,6 @@ void EXT_FUNC DELTA_AddEncoder(char *name, void(*conditionalencode)(struct delta
g_encoders = p; g_encoders = p;
} }
/* <24c9d> ../engine/delta.c:1293 */
void DELTA_ClearEncoders(void) void DELTA_ClearEncoders(void)
{ {
delta_encoder_t *n, *p = g_encoders; delta_encoder_t *n, *p = g_encoders;
@ -1037,7 +1017,6 @@ void DELTA_ClearEncoders(void)
g_encoders = 0; g_encoders = 0;
} }
/* <24ce9> ../engine/delta.c:1315 */
encoder_t DELTA_LookupEncoder(char *name) encoder_t DELTA_LookupEncoder(char *name)
{ {
delta_encoder_t *p = g_encoders; delta_encoder_t *p = g_encoders;
@ -1052,7 +1031,6 @@ encoder_t DELTA_LookupEncoder(char *name)
return NULL; return NULL;
} }
/* <23d3e> ../engine/delta.c:1338 */
int DELTA_CountLinks(delta_link_t *plinks) int DELTA_CountLinks(delta_link_t *plinks)
{ {
delta_link_t *p = plinks; delta_link_t *p = plinks;
@ -1066,7 +1044,6 @@ int DELTA_CountLinks(delta_link_t *plinks)
return c; return c;
} }
/* <23cf6> ../engine/delta.c:1360 */
void DELTA_ReverseLinks(delta_link_t **plinks) void DELTA_ReverseLinks(delta_link_t **plinks)
{ {
delta_link_t *n, *p = *plinks; delta_link_t *n, *p = *plinks;
@ -1083,7 +1060,6 @@ void DELTA_ReverseLinks(delta_link_t **plinks)
*plinks = newlist; *plinks = newlist;
} }
/* <24d8d> ../engine/delta.c:1383 */
void DELTA_ClearLinks(delta_link_t **plinks) void DELTA_ClearLinks(delta_link_t **plinks)
{ {
delta_link_t *n, *p = *plinks; delta_link_t *n, *p = *plinks;
@ -1096,7 +1072,6 @@ void DELTA_ClearLinks(delta_link_t **plinks)
*plinks = 0; *plinks = 0;
} }
/* <24ded> ../engine/delta.c:1405 */
delta_t *DELTA_BuildFromLinks(delta_link_t **pplinks) delta_t *DELTA_BuildFromLinks(delta_link_t **pplinks)
{ {
delta_description_t *pdesc, *pcur; delta_description_t *pdesc, *pcur;
@ -1133,7 +1108,6 @@ delta_t *DELTA_BuildFromLinks(delta_link_t **pplinks)
return pdelta; return pdelta;
} }
/* <23dfa> ../engine/delta.c:1445 */
int DELTA_FindOffset(int count, delta_definition_t *pdef, char *fieldname) int DELTA_FindOffset(int count, delta_definition_t *pdef, char *fieldname)
{ {
for (int i = 0; i < count; i++) for (int i = 0; i < count; i++)
@ -1147,7 +1121,6 @@ int DELTA_FindOffset(int count, delta_definition_t *pdef, char *fieldname)
Sys_Error(__FUNCTION__ ": Couldn't find offset for %s!!!\n", fieldname); Sys_Error(__FUNCTION__ ": Couldn't find offset for %s!!!\n", fieldname);
} }
/* <24f58> ../engine/delta.c:1469 */
qboolean DELTA_ParseType(delta_description_t *pdelta, char **pstream) qboolean DELTA_ParseType(delta_description_t *pdelta, char **pstream)
{ {
// Read the stream till we hit the end // Read the stream till we hit the end
@ -1187,7 +1160,6 @@ qboolean DELTA_ParseType(delta_description_t *pdelta, char **pstream)
return FALSE; return FALSE;
} }
/* <24f95> ../engine/delta.c:1545 */
qboolean DELTA_ParseField(int count, delta_definition_t *pdefinition, delta_link_t *pField, char **pstream) qboolean DELTA_ParseField(int count, delta_definition_t *pdefinition, delta_link_t *pField, char **pstream)
{ {
int readpost; int readpost;
@ -1258,7 +1230,6 @@ qboolean DELTA_ParseField(int count, delta_definition_t *pdefinition, delta_link
return TRUE; return TRUE;
} }
/* <25051> ../engine/delta.c:1657 */
void DELTA_FreeDescription(delta_t **ppdesc) void DELTA_FreeDescription(delta_t **ppdesc)
{ {
delta_t *p; delta_t *p;
@ -1276,7 +1247,6 @@ void DELTA_FreeDescription(delta_t **ppdesc)
} }
} }
/* <23d92> ../engine/delta.c:1679 */
void DELTA_AddDefinition(char *name, delta_definition_t *pdef, int numelements) void DELTA_AddDefinition(char *name, delta_definition_t *pdef, int numelements)
{ {
delta_definition_list_t *p = g_defs; delta_definition_list_t *p = g_defs;
@ -1301,7 +1271,6 @@ void DELTA_AddDefinition(char *name, delta_definition_t *pdef, int numelements)
p->numelements = numelements; p->numelements = numelements;
} }
/* <25100> ../engine/delta.c:1713 */
void DELTA_ClearDefinitions(void) void DELTA_ClearDefinitions(void)
{ {
delta_definition_list_t *n, *p = g_defs; delta_definition_list_t *n, *p = g_defs;
@ -1315,7 +1284,6 @@ void DELTA_ClearDefinitions(void)
g_defs = 0; g_defs = 0;
} }
/* <23e3c> ../engine/delta.c:1735 */
delta_definition_t *DELTA_FindDefinition(char *name, int *count) delta_definition_t *DELTA_FindDefinition(char *name, int *count)
{ {
delta_definition_list_t *p = g_defs; delta_definition_list_t *p = g_defs;
@ -1335,7 +1303,6 @@ delta_definition_t *DELTA_FindDefinition(char *name, int *count)
return NULL; return NULL;
} }
/* <2517b> ../engine/delta.c:1765 */
void DELTA_SkipDescription(char **pstream) void DELTA_SkipDescription(char **pstream)
{ {
*pstream = COM_Parse(*pstream); *pstream = COM_Parse(*pstream);
@ -1349,7 +1316,6 @@ void DELTA_SkipDescription(char **pstream)
} while (Q_stricmp(com_token, "}")); } while (Q_stricmp(com_token, "}"));
} }
/* <251b5> ../engine/delta.c:1792 */
qboolean DELTA_ParseOneField(char **ppstream, delta_link_t **pplist, int count, delta_definition_t *pdefinition) qboolean DELTA_ParseOneField(char **ppstream, delta_link_t **pplist, int count, delta_definition_t *pdefinition)
{ {
delta_link_t *newlink; delta_link_t *newlink;
@ -1384,7 +1350,6 @@ qboolean DELTA_ParseOneField(char **ppstream, delta_link_t **pplist, int count,
return TRUE; return TRUE;
} }
/* <2523f> ../engine/delta.c:1842 */
qboolean DELTA_ParseDescription(char *name, delta_t **ppdesc, char *pstream) qboolean DELTA_ParseDescription(char *name, delta_t **ppdesc, char *pstream)
{ {
delta_link_t *links; delta_link_t *links;
@ -1488,7 +1453,6 @@ qboolean DELTA_ParseDescription(char *name, delta_t **ppdesc, char *pstream)
return TRUE; return TRUE;
} }
/* <25338> ../engine/delta.c:1959 */
qboolean DELTA_Load(char *name, delta_t **ppdesc, char *pszFile) qboolean DELTA_Load(char *name, delta_t **ppdesc, char *pszFile)
{ {
char *pbuf; char *pbuf;
@ -1507,7 +1471,6 @@ qboolean DELTA_Load(char *name, delta_t **ppdesc, char *pszFile)
return bret; return bret;
} }
/* <253a4> ../engine/delta.c:1990 */
void DELTA_RegisterDescription(char *name) void DELTA_RegisterDescription(char *name)
{ {
delta_registry_t *p = (delta_registry_t *)Mem_ZeroMalloc(sizeof(delta_registry_t)); delta_registry_t *p = (delta_registry_t *)Mem_ZeroMalloc(sizeof(delta_registry_t));
@ -1517,7 +1480,6 @@ void DELTA_RegisterDescription(char *name)
p->pdesc = 0; p->pdesc = 0;
} }
/* <253dc> ../engine/delta.c:2008 */
void DELTA_ClearRegistrations(void) void DELTA_ClearRegistrations(void)
{ {
delta_registry_t *n, *p = g_deltaregistry; delta_registry_t *n, *p = g_deltaregistry;
@ -1533,7 +1495,6 @@ void DELTA_ClearRegistrations(void)
g_deltaregistry = 0; g_deltaregistry = 0;
} }
/* <25442> ../engine/delta.c:2036 */
delta_t **DELTA_LookupRegistration(const char *name) delta_t **DELTA_LookupRegistration(const char *name)
{ {
delta_registry_t *p = g_deltaregistry; delta_registry_t *p = g_deltaregistry;
@ -1548,7 +1509,6 @@ delta_t **DELTA_LookupRegistration(const char *name)
return NULL; return NULL;
} }
/* <23dd6> ../engine/delta.c:2060 */
void DELTA_ClearStats(delta_t *p) void DELTA_ClearStats(delta_t *p)
{ {
int i; int i;
@ -1563,7 +1523,6 @@ void DELTA_ClearStats(delta_t *p)
} }
} }
/* <23e72> ../engine/delta.c:2081 */
void DELTA_ClearStats_f(void) void DELTA_ClearStats_f(void)
{ {
delta_registry_t *p; delta_registry_t *p;
@ -1575,7 +1534,6 @@ void DELTA_ClearStats_f(void)
} }
} }
/* <23ece> ../engine/delta.c:2100 */
void DELTA_PrintStats(const char *name, delta_t *p) void DELTA_PrintStats(const char *name, delta_t *p)
{ {
if (p) if (p)
@ -1593,7 +1551,6 @@ void DELTA_PrintStats(const char *name, delta_t *p)
} }
} }
/* <23efe> ../engine/delta.c:2124 */
void DELTA_DumpStats_f(void) void DELTA_DumpStats_f(void)
{ {
Con_Printf("Delta Stats\n"); Con_Printf("Delta Stats\n");
@ -1601,7 +1558,6 @@ void DELTA_DumpStats_f(void)
DELTA_PrintStats(dr->name, dr->pdesc); DELTA_PrintStats(dr->name, dr->pdesc);
} }
/* <254d4> ../engine/delta.c:2143 */
void DELTA_Init(void) void DELTA_Init(void)
{ {
Cmd_AddCommand("delta_stats", DELTA_DumpStats_f); Cmd_AddCommand("delta_stats", DELTA_DumpStats_f);
@ -1616,7 +1572,6 @@ void DELTA_Init(void)
DELTA_AddDefinition("event_t", g_EventDataDefinition, ARRAYSIZE(g_EventDataDefinition)); DELTA_AddDefinition("event_t", g_EventDataDefinition, ARRAYSIZE(g_EventDataDefinition));
} }
/* <25847> ../engine/delta.c:2164 */
void DELTA_Shutdown(void) void DELTA_Shutdown(void)
{ {
DELTA_ClearEncoders(); DELTA_ClearEncoders();

17
rehlds/engine/delta.h
View File

@ -29,34 +29,29 @@
#include "maintypes.h" #include "maintypes.h"
#define DELTA_MAX_FIELDS 56 // 7*8 #define DELTA_MAX_FIELDS 56 // 7*8
#define DT_BYTE BIT(0) // A byte #define DT_BYTE BIT(0) // A byte
#define DT_SHORT BIT(1) // 2 byte field #define DT_SHORT BIT(1) // 2 byte field
#define DT_FLOAT BIT(2) // A floating point field #define DT_FLOAT BIT(2) // A floating point field
#define DT_INTEGER BIT(3) // 4 byte integer #define DT_INTEGER BIT(3) // 4 byte integer
#define DT_ANGLE BIT(4) // A floating point angle #define DT_ANGLE BIT(4) // A floating point angle
#define DT_TIMEWINDOW_8 BIT(5) // A floating point timestamp relative to server time #define DT_TIMEWINDOW_8 BIT(5) // A floating point timestamp relative to server time
#define DT_TIMEWINDOW_BIG BIT(6) // A floating point timestamp relative to server time (with more precision and custom multiplier) #define DT_TIMEWINDOW_BIG BIT(6) // A floating point timestamp relative to server time (with more precision and custom multiplier)
#define DT_STRING BIT(7) // A null terminated string, sent as 8 byte chars #define DT_STRING BIT(7) // A null terminated string, sent as 8 byte chars
#define DT_SIGNED BIT(31) // sign modificator #define DT_SIGNED BIT(31) // sign modificator
#define FDT_MARK BIT(0) // Delta mark for sending #define FDT_MARK BIT(0) // Delta mark for sending
typedef struct delta_s delta_t; typedef struct delta_s delta_t;
/* <bf6d> ../engine/delta.h:76 */
typedef void(*encoder_t)(delta_t *, const unsigned char *, const unsigned char *); typedef void(*encoder_t)(delta_t *, const unsigned char *, const unsigned char *);
/* <9f6a5> ../engine/delta.h:34 */
typedef struct delta_stats_s typedef struct delta_stats_s
{ {
int sendcount; int sendcount;
int receivedcount; int receivedcount;
} delta_stats_t; } delta_stats_t;
/* <bee2> ../engine/delta.h:45 */
typedef struct delta_description_s typedef struct delta_description_s
{ {
int fieldType; int fieldType;
@ -72,7 +67,6 @@ typedef struct delta_description_s
class CDeltaJit; class CDeltaJit;
/* <bfa0> ../engine/delta.h:78 */
typedef struct delta_s typedef struct delta_s
{ {
int dynamic; int dynamic;
@ -86,10 +80,8 @@ typedef struct delta_s
#endif #endif
} delta_t; } delta_t;
/* <23b2a> ../engine/delta.h:104 */
typedef struct delta_encoder_s delta_encoder_t; typedef struct delta_encoder_s delta_encoder_t;
/* <23b35> ../engine/delta.h:106 */
struct delta_encoder_s struct delta_encoder_s
{ {
delta_encoder_t *next; delta_encoder_t *next;
@ -103,7 +95,6 @@ typedef struct delta_definition_list_s delta_definition_list_t;
typedef struct delta_registry_s delta_registry_t; typedef struct delta_registry_s delta_registry_t;
typedef struct delta_info_s delta_info_t; typedef struct delta_info_s delta_info_t;
/* <a59b9> ../engine/sv_main.c:102 */
typedef struct delta_info_s typedef struct delta_info_s
{ {
delta_info_s *next; delta_info_s *next;
@ -118,13 +109,11 @@ typedef struct delta_info_s
#define g_deltaregistry (*pg_deltaregistry) #define g_deltaregistry (*pg_deltaregistry)
#endif // HOOK_ENGINE #endif // HOOK_ENGINE
extern delta_definition_list_t *g_defs; extern delta_definition_list_t *g_defs;
extern delta_encoder_t *g_encoders; extern delta_encoder_t *g_encoders;
extern delta_registry_t *g_deltaregistry; extern delta_registry_t *g_deltaregistry;
extern delta_t g_MetaDelta[]; extern delta_t g_MetaDelta[];
delta_description_t *DELTA_FindField(delta_t *pFields, const char *pszField); delta_description_t *DELTA_FindField(delta_t *pFields, const char *pszField);
int DELTA_FindFieldIndex(struct delta_s *pFields, const char *fieldname); int DELTA_FindFieldIndex(struct delta_s *pFields, const char *fieldname);
void DELTA_SetField(struct delta_s *pFields, const char *fieldname); void DELTA_SetField(struct delta_s *pFields, const char *fieldname);

2
rehlds/engine/delta_packet.h
View File

@ -34,8 +34,6 @@
#include "entity_state.h" #include "entity_state.h"
/* <138fb> ../engine/delta_packet.h:39 */
typedef struct packet_entities_s typedef struct packet_entities_s
{ {
int num_entities; int num_entities;

10
rehlds/engine/event.h
View File

@ -32,14 +32,12 @@
#pragma once #pragma once
#endif #endif
/* <75ae> ../engine/event.h:6 */
typedef struct event_s typedef struct event_s
{ {
unsigned short index; unsigned short index;
const char *filename; const char *filename;
int filesize; int filesize;
const char *pszScript; const char *pszScript;
} event_t; } event_t;
#endif // EVENT_H #endif // EVENT_H

22
rehlds/engine/filesystem.cpp
View File

@ -35,13 +35,11 @@ bool bLowViolenceBuild;
CSysModule *g_pFileSystemModule; CSysModule *g_pFileSystemModule;
CreateInterfaceFn g_FileSystemFactory; CreateInterfaceFn g_FileSystemFactory;
/* <28515> ../engine/filesystem.cpp:66 */
const char *GetBaseDirectory(void) const char *GetBaseDirectory(void)
{ {
return s_pBaseDir; return s_pBaseDir;
} }
/* <2891f> ../engine/filesystem.cpp:71 */
NOXREF void *GetFileSystemFactory(void) NOXREF void *GetFileSystemFactory(void)
{ {
NOXREFCHECK; NOXREFCHECK;
@ -49,7 +47,6 @@ NOXREF void *GetFileSystemFactory(void)
return (void *)g_FileSystemFactory; return (void *)g_FileSystemFactory;
} }
/* <28522> ../engine/filesystem.cpp:81 */
bool FileSystem_LoadDLL(CreateInterfaceFn filesystemFactory) bool FileSystem_LoadDLL(CreateInterfaceFn filesystemFactory)
{ {
if (!filesystemFactory) if (!filesystemFactory)
@ -73,7 +70,6 @@ bool FileSystem_LoadDLL(CreateInterfaceFn filesystemFactory)
return false; return false;
} }
/* <2854b> ../engine/filesystem.cpp:119 */
void FileSystem_UnloadDLL(void) void FileSystem_UnloadDLL(void)
{ {
if (g_pFileSystemModule) if (g_pFileSystemModule)
@ -85,7 +81,6 @@ void FileSystem_UnloadDLL(void)
} }
} }
/* <284fb> ../engine/filesystem.cpp:129 */
bool BEnabledHDAddon(void) bool BEnabledHDAddon(void)
{ {
if (COM_CheckParm("-nohdmodels")) if (COM_CheckParm("-nohdmodels"))
@ -96,7 +91,6 @@ bool BEnabledHDAddon(void)
return (registry->ReadInt("hdmodels", 1) > 0); return (registry->ReadInt("hdmodels", 1) > 0);
} }
/* <28508> ../engine/filesystem.cpp:138 */
bool BEnableAddonsFolder(void) bool BEnableAddonsFolder(void)
{ {
if (COM_CheckParm("-addons")) if (COM_CheckParm("-addons"))
@ -107,7 +101,6 @@ bool BEnableAddonsFolder(void)
return (registry->ReadInt("addons_folder", 0) > 0); return (registry->ReadInt("addons_folder", 0) > 0);
} }
/* <28984> ../engine/filesystem.cpp:148 */
void Host_SetHDModels_f(void) void Host_SetHDModels_f(void)
{ {
if (g_pcls.state && Cmd_Argc() == 2) if (g_pcls.state && Cmd_Argc() == 2)
@ -123,7 +116,6 @@ void Host_SetHDModels_f(void)
} }
} }
/* <289d1> ../engine/filesystem.cpp:176 */
void Host_SetAddonsFolder_f(void) void Host_SetAddonsFolder_f(void)
{ {
if (g_pcls.state && Cmd_Argc() == 2) if (g_pcls.state && Cmd_Argc() == 2)
@ -139,7 +131,6 @@ void Host_SetAddonsFolder_f(void)
} }
} }
/* <28a1e> ../engine/filesystem.cpp:204 */
void Host_SetVideoLevel_f(void) void Host_SetVideoLevel_f(void)
{ {
if (g_pcls.state && Cmd_Argc() == 2) if (g_pcls.state && Cmd_Argc() == 2)
@ -148,13 +139,11 @@ void Host_SetVideoLevel_f(void)
} }
} }
/* <28a32> ../engine/filesystem.cpp:224 */
int Host_GetVideoLevel(void) int Host_GetVideoLevel(void)
{ {
return registry->ReadInt("vid_level", 0); return registry->ReadInt("vid_level", 0);
} }
/* <28a68> ../engine/filesystem.cpp:235 */
void CheckLiblistForFallbackDir(const char *pGameDir, bool bLanguage, const char *pLanguage, bool bLowViolenceBuild_) void CheckLiblistForFallbackDir(const char *pGameDir, bool bLanguage, const char *pLanguage, bool bLowViolenceBuild_)
{ {
char szTemp[512]; char szTemp[512];
@ -306,7 +295,6 @@ void CheckLiblistForFallbackDir(const char *pGameDir, bool bLanguage, const char
FS_Close(hFile); FS_Close(hFile);
} }
/* <28deb> ../engine/filesystem.cpp:393 */
int FileSystem_SetGameDirectory(const char *pDefaultDir, const char *pGameDir) int FileSystem_SetGameDirectory(const char *pDefaultDir, const char *pGameDir)
{ {
char temp[512]; char temp[512];
@ -467,7 +455,6 @@ int FileSystem_SetGameDirectory(const char *pDefaultDir, const char *pGameDir)
} }
/* <28f6a> ../engine/filesystem.cpp:596 */
int FileSystem_AddFallbackGameDir(const char *pGameDir) int FileSystem_AddFallbackGameDir(const char *pGameDir)
{ {
char language[128]; char language[128];
@ -488,7 +475,6 @@ int FileSystem_AddFallbackGameDir(const char *pGameDir)
return 1; return 1;
} }
/* <28fd7> ../engine/filesystem.cpp:626 */
int FileSystem_Init(char *basedir, void *voidfilesystemFactory) int FileSystem_Init(char *basedir, void *voidfilesystemFactory)
{ {
#ifdef REHLDS_CHECKS #ifdef REHLDS_CHECKS
@ -508,16 +494,8 @@ int FileSystem_Init(char *basedir, void *voidfilesystemFactory)
return 0; return 0;
} }
/* <29057> ../engine/filesystem.cpp:645 */
void FileSystem_Shutdown(void) void FileSystem_Shutdown(void)
{ {
FS_RemoveAllSearchPaths(); FS_RemoveAllSearchPaths();
FileSystem_UnloadDLL(); FileSystem_UnloadDLL();
} }
/* <29085> (null):39776 */
NOBODY void _GLOBAL__sub_I_g_FileSystemFactory(void);
//{
// __static_initialization_and_destruction_0(int __initialize_p,
// int __priority); /* size=6582895, low_pc=0 */ // 649
//}

1
rehlds/engine/filesystem_.h
View File

@ -73,6 +73,5 @@ int FileSystem_SetGameDirectory(const char *pDefaultDir, const char *pGameDir);
int FileSystem_AddFallbackGameDir(const char *pGameDir); int FileSystem_AddFallbackGameDir(const char *pGameDir);
int FileSystem_Init(char *basedir, void *voidfilesystemFactory); int FileSystem_Init(char *basedir, void *voidfilesystemFactory);
void FileSystem_Shutdown(void); void FileSystem_Shutdown(void);
NOBODY void _GLOBAL__sub_I_g_FileSystemFactory(void);
#endif // FILESYSTEM__H #endif // FILESYSTEM__H

49
rehlds/engine/filesystem_internal.cpp
View File

@ -30,8 +30,6 @@
IFileSystem *g_pFileSystem; IFileSystem *g_pFileSystem;
/* <2605f> ../engine/filesystem_internal.cpp:18 */
NOXREF void FS_RemoveAllSearchPaths(void) NOXREF void FS_RemoveAllSearchPaths(void)
{ {
//NOXREFCHECK; // We call it //NOXREFCHECK; // We call it
@ -39,13 +37,11 @@ NOXREF void FS_RemoveAllSearchPaths(void)
g_pFileSystem->RemoveAllSearchPaths(); g_pFileSystem->RemoveAllSearchPaths();
} }
/* <26073> ../engine/filesystem_internal.cpp:24 */
void FS_AddSearchPath(const char *pPath, const char *pathID) void FS_AddSearchPath(const char *pPath, const char *pathID)
{ {
g_pFileSystem->AddSearchPath(pPath, pathID); g_pFileSystem->AddSearchPath(pPath, pathID);
} }
/* <260a8> ../engine/filesystem_internal.cpp:30 */
NOXREF int FS_RemoveSearchPath(const char *pPath) NOXREF int FS_RemoveSearchPath(const char *pPath)
{ {
NOXREFCHECK; NOXREFCHECK;
@ -53,25 +49,21 @@ NOXREF int FS_RemoveSearchPath(const char *pPath)
return g_pFileSystem->RemoveSearchPath(pPath); return g_pFileSystem->RemoveSearchPath(pPath);
} }
/* <260d3> ../engine/filesystem_internal.cpp:36 */
void FS_RemoveFile(const char *pRelativePath, const char *pathID) void FS_RemoveFile(const char *pRelativePath, const char *pathID)
{ {
g_pFileSystem->RemoveFile(pRelativePath, pathID); g_pFileSystem->RemoveFile(pRelativePath, pathID);
} }
/* <26108> ../engine/filesystem_internal.cpp:42 */
void FS_CreateDirHierarchy(const char *path, const char *pathID) void FS_CreateDirHierarchy(const char *path, const char *pathID)
{ {
g_pFileSystem->CreateDirHierarchy(path, pathID); g_pFileSystem->CreateDirHierarchy(path, pathID);
} }
/* <2613d> ../engine/filesystem_internal.cpp:48 */
int FS_FileExists(const char *pFileName) int FS_FileExists(const char *pFileName)
{ {
return g_pFileSystem->FileExists(pFileName); return g_pFileSystem->FileExists(pFileName);
} }
/* <26168> ../engine/filesystem_internal.cpp:54 */
NOXREF int FS_IsDirectory(const char *pFileName) NOXREF int FS_IsDirectory(const char *pFileName)
{ {
NOXREFCHECK; NOXREFCHECK;
@ -79,55 +71,46 @@ NOXREF int FS_IsDirectory(const char *pFileName)
return g_pFileSystem->IsDirectory(pFileName); return g_pFileSystem->IsDirectory(pFileName);
} }
/* <26193> ../engine/filesystem_internal.cpp:60 */
FileHandle_t FS_Open(const char *pFileName, const char *pOptions) FileHandle_t FS_Open(const char *pFileName, const char *pOptions)
{ {
return g_pFileSystem->Open(pFileName, pOptions, 0); return g_pFileSystem->Open(pFileName, pOptions, 0);
} }
/* <261cc> ../engine/filesystem_internal.cpp:66 */
FileHandle_t FS_OpenPathID(const char *pFileName, const char *pOptions, const char *pathID) FileHandle_t FS_OpenPathID(const char *pFileName, const char *pOptions, const char *pathID)
{ {
return g_pFileSystem->Open(pFileName, pOptions, pathID); return g_pFileSystem->Open(pFileName, pOptions, pathID);
} }
/* <26213> ../engine/filesystem_internal.cpp:72 */
void FS_Close(FileHandle_t file) void FS_Close(FileHandle_t file)
{ {
g_pFileSystem->Close(file); g_pFileSystem->Close(file);
} }
/* <2623a> ../engine/filesystem_internal.cpp:78 */
void FS_Seek(FileHandle_t file, int pos, FileSystemSeek_t seekType) void FS_Seek(FileHandle_t file, int pos, FileSystemSeek_t seekType)
{ {
g_pFileSystem->Seek(file, pos, seekType); g_pFileSystem->Seek(file, pos, seekType);
} }
/* <2627d> ../engine/filesystem_internal.cpp:84 */
unsigned int FS_Tell(FileHandle_t file) unsigned int FS_Tell(FileHandle_t file)
{ {
return g_pFileSystem->Tell(file); return g_pFileSystem->Tell(file);
} }
/* <262a8> ../engine/filesystem_internal.cpp:90 */
unsigned int FS_Size(FileHandle_t file) unsigned int FS_Size(FileHandle_t file)
{ {
return g_pFileSystem->Size(file); return g_pFileSystem->Size(file);
} }
/* <262d3> ../engine/filesystem_internal.cpp:96 */
unsigned int FS_FileSize(const char *pFileName) unsigned int FS_FileSize(const char *pFileName)
{ {
return g_pFileSystem->Size(pFileName); return g_pFileSystem->Size(pFileName);
} }
/* <262fe> ../engine/filesystem_internal.cpp:101 */
int32 FS_GetFileTime(const char *pFileName) int32 FS_GetFileTime(const char *pFileName)
{ {
return g_pFileSystem->GetFileTime(pFileName); return g_pFileSystem->GetFileTime(pFileName);
} }
/* <26329> ../engine/filesystem_internal.cpp:107 */
NOXREF void FS_FileTimeToString(char *pStrip, int maxCharsIncludingTerminator, int32 fileTime) NOXREF void FS_FileTimeToString(char *pStrip, int maxCharsIncludingTerminator, int32 fileTime)
{ {
NOXREFCHECK; NOXREFCHECK;
@ -135,25 +118,21 @@ NOXREF void FS_FileTimeToString(char *pStrip, int maxCharsIncludingTerminator, i
g_pFileSystem->FileTimeToString(pStrip, maxCharsIncludingTerminator, fileTime); g_pFileSystem->FileTimeToString(pStrip, maxCharsIncludingTerminator, fileTime);
} }
/* <2636c> ../engine/filesystem_internal.cpp:113 */
int FS_IsOk(FileHandle_t file) int FS_IsOk(FileHandle_t file)
{ {
return g_pFileSystem->IsOk(file); return g_pFileSystem->IsOk(file);
} }
/* <26397> ../engine/filesystem_internal.cpp:119 */
void FS_Flush(FileHandle_t file) void FS_Flush(FileHandle_t file)
{ {
g_pFileSystem->Flush(file); g_pFileSystem->Flush(file);
} }
/* <263be> ../engine/filesystem_internal.cpp:125 */
int FS_EndOfFile(FileHandle_t file) int FS_EndOfFile(FileHandle_t file)
{ {
return g_pFileSystem->EndOfFile(file); return g_pFileSystem->EndOfFile(file);
} }
/* <25fa9> ../engine/filesystem_internal.cpp:131 */
int FS_Read(void *pOutput, int size, int count, FileHandle_t file) int FS_Read(void *pOutput, int size, int count, FileHandle_t file)
{ {
#ifdef REHLDS_FIXES #ifdef REHLDS_FIXES
@ -163,7 +142,6 @@ int FS_Read(void *pOutput, int size, int count, FileHandle_t file)
#endif // REHLDS_FIXES #endif // REHLDS_FIXES
} }
/* <2641e> ../engine/filesystem_internal.cpp:138 */
int FS_Write(const void *pInput, int size, int count, FileHandle_t file) int FS_Write(const void *pInput, int size, int count, FileHandle_t file)
{ {
#ifdef REHLDS_FIXES #ifdef REHLDS_FIXES
@ -173,13 +151,11 @@ int FS_Write(const void *pInput, int size, int count, FileHandle_t file)
#endif // REHLDS_FIXES #endif // REHLDS_FIXES
} }
/* <26479> ../engine/filesystem_internal.cpp:145 */
char *FS_ReadLine(char *pOutput, int maxChars, FileHandle_t file) char *FS_ReadLine(char *pOutput, int maxChars, FileHandle_t file)
{ {
return g_pFileSystem->ReadLine(pOutput, maxChars, file); return g_pFileSystem->ReadLine(pOutput, maxChars, file);
} }
/* <264c0> ../engine/filesystem_internal.cpp:151 */
int FS_FPrintf(FileHandle_t file, char *pFormat, ...) int FS_FPrintf(FileHandle_t file, char *pFormat, ...)
{ {
char data[8192]; char data[8192];
@ -192,19 +168,16 @@ int FS_FPrintf(FileHandle_t file, char *pFormat, ...)
return g_pFileSystem->FPrintf(file, "%s", data); return g_pFileSystem->FPrintf(file, "%s", data);
} }
/* <26534> ../engine/filesystem_internal.cpp:164 */
const char *FS_FindFirst(const char *pWildCard, FileFindHandle_t *pHandle, const char *pathID) const char *FS_FindFirst(const char *pWildCard, FileFindHandle_t *pHandle, const char *pathID)
{ {
return g_pFileSystem->FindFirst(pWildCard, pHandle, pathID); return g_pFileSystem->FindFirst(pWildCard, pHandle, pathID);
} }
/* <26581> ../engine/filesystem_internal.cpp:170 */
const char *FS_FindNext(FileFindHandle_t handle) const char *FS_FindNext(FileFindHandle_t handle)
{ {
return g_pFileSystem->FindNext(handle); return g_pFileSystem->FindNext(handle);
} }
/* <265ac> ../engine/filesystem_internal.cpp:176 */
NOXREF int FS_FindIsDirectory(FileFindHandle_t handle) NOXREF int FS_FindIsDirectory(FileFindHandle_t handle)
{ {
NOXREFCHECK; NOXREFCHECK;
@ -212,25 +185,21 @@ NOXREF int FS_FindIsDirectory(FileFindHandle_t handle)
return g_pFileSystem->FindIsDirectory(handle); return g_pFileSystem->FindIsDirectory(handle);
} }
/* <265d7> ../engine/filesystem_internal.cpp:182 */
void FS_FindClose(FileFindHandle_t handle) void FS_FindClose(FileFindHandle_t handle)
{ {
return g_pFileSystem->FindClose(handle); return g_pFileSystem->FindClose(handle);
} }
/* <26046> ../engine/filesystem_internal.cpp:188 */
void FS_GetLocalCopy(const char *pFileName) void FS_GetLocalCopy(const char *pFileName)
{ {
g_pFileSystem->GetLocalCopy(pFileName); g_pFileSystem->GetLocalCopy(pFileName);
} }
/* <25fe7> ../engine/filesystem_internal.cpp:194 */
const char *FS_GetLocalPath(const char *pFileName, char *pLocalPath, int localPathBufferSize) const char *FS_GetLocalPath(const char *pFileName, char *pLocalPath, int localPathBufferSize)
{ {
return g_pFileSystem->GetLocalPath(pFileName, pLocalPath, localPathBufferSize); return g_pFileSystem->GetLocalPath(pFileName, pLocalPath, localPathBufferSize);
} }
/* <2664a> ../engine/filesystem_internal.cpp:200 */
NOXREF char *FS_ParseFile(char *pFileBytes, char *pToken, int *pWasQuoted) NOXREF char *FS_ParseFile(char *pFileBytes, char *pToken, int *pWasQuoted)
{ {
NOXREFCHECK; NOXREFCHECK;
@ -246,7 +215,6 @@ NOXREF char *FS_ParseFile(char *pFileBytes, char *pToken, int *pWasQuoted)
return result; return result;
} }
/* <266ba> ../engine/filesystem_internal.cpp:214 */
NOXREF int FS_FullPathToRelativePath(const char *pFullpath, char *pRelative) NOXREF int FS_FullPathToRelativePath(const char *pFullpath, char *pRelative)
{ {
NOXREFCHECK; NOXREFCHECK;
@ -254,7 +222,6 @@ NOXREF int FS_FullPathToRelativePath(const char *pFullpath, char *pRelative)
return g_pFileSystem->FullPathToRelativePath(pFullpath, pRelative); return g_pFileSystem->FullPathToRelativePath(pFullpath, pRelative);
} }
/* <266f3> ../engine/filesystem_internal.cpp:220 */
NOXREF int FS_GetCurrentDirectory(char *pDirectory, int maxlen) NOXREF int FS_GetCurrentDirectory(char *pDirectory, int maxlen)
{ {
NOXREFCHECK; NOXREFCHECK;
@ -262,7 +229,6 @@ NOXREF int FS_GetCurrentDirectory(char *pDirectory, int maxlen)
return g_pFileSystem->GetCurrentDirectory(pDirectory, maxlen); return g_pFileSystem->GetCurrentDirectory(pDirectory, maxlen);
} }
/* <2672c> ../engine/filesystem_internal.cpp:226 */
NOXREF void FS_PrintOpenedFiles(void) NOXREF void FS_PrintOpenedFiles(void)
{ {
NOXREFCHECK; NOXREFCHECK;
@ -270,7 +236,6 @@ NOXREF void FS_PrintOpenedFiles(void)
g_pFileSystem->PrintOpenedFiles(); g_pFileSystem->PrintOpenedFiles();
} }
/* <26740> ../engine/filesystem_internal.cpp:232 */
NOXREF void FS_SetWarningFunc(void (*pfnWarning)(const char *, ...)) NOXREF void FS_SetWarningFunc(void (*pfnWarning)(const char *, ...))
{ {
NOXREFCHECK; NOXREFCHECK;
@ -278,7 +243,6 @@ NOXREF void FS_SetWarningFunc(void (*pfnWarning)(const char *, ...))
g_pFileSystem->SetWarningFunc(pfnWarning); g_pFileSystem->SetWarningFunc(pfnWarning);
} }
/* <26779> ../engine/filesystem_internal.cpp:238 */
NOXREF void FS_SetWarningLevel(FileWarningLevel_t level) NOXREF void FS_SetWarningLevel(FileWarningLevel_t level)
{ {
NOXREFCHECK; NOXREFCHECK;
@ -286,7 +250,6 @@ NOXREF void FS_SetWarningLevel(FileWarningLevel_t level)
g_pFileSystem->SetWarningLevel(level); g_pFileSystem->SetWarningLevel(level);
} }
/* <267a0> ../engine/filesystem_internal.cpp:245 */
NOXREF unsigned char FS_GetCharacter(FileHandle_t f) NOXREF unsigned char FS_GetCharacter(FileHandle_t f)
{ {
NOXREFCHECK; NOXREFCHECK;
@ -296,43 +259,36 @@ NOXREF unsigned char FS_GetCharacter(FileHandle_t f)
return retval; return retval;
} }
/* <2680e> ../engine/filesystem_internal.cpp:252 */
void FS_LogLevelLoadStarted(const char *name) void FS_LogLevelLoadStarted(const char *name)
{ {
g_pFileSystem->LogLevelLoadStarted(name); g_pFileSystem->LogLevelLoadStarted(name);
} }
/* <26835> ../engine/filesystem_internal.cpp:257 */
void FS_LogLevelLoadFinished(const char *name) void FS_LogLevelLoadFinished(const char *name)
{ {
g_pFileSystem->LogLevelLoadFinished(name); g_pFileSystem->LogLevelLoadFinished(name);
} }
/* <2685e> ../engine/filesystem_internal.cpp:262 */
int FS_SetVBuf(FileHandle_t stream, char *buffer, int mode, size_t size) int FS_SetVBuf(FileHandle_t stream, char *buffer, int mode, size_t size)
{ {
return g_pFileSystem->SetVBuf(stream, buffer, mode, size); return g_pFileSystem->SetVBuf(stream, buffer, mode, size);
} }
/* <268b8> ../engine/filesystem_internal.cpp:267 */
void FS_GetInterfaceVersion(char *p, int maxlen) void FS_GetInterfaceVersion(char *p, int maxlen)
{ {
g_pFileSystem->GetInterfaceVersion(p, maxlen); g_pFileSystem->GetInterfaceVersion(p, maxlen);
} }
/* <268ee> ../engine/filesystem_internal.cpp:272 */
void *FS_GetReadBuffer(FileHandle_t file, int *outBufSize) void *FS_GetReadBuffer(FileHandle_t file, int *outBufSize)
{ {
return g_pFileSystem->GetReadBuffer(file, outBufSize, 1); return g_pFileSystem->GetReadBuffer(file, outBufSize, 1);
} }
/* <2692a> ../engine/filesystem_internal.cpp:277 */
void FS_ReleaseReadBuffer(FileHandle_t file, void *buffer) void FS_ReleaseReadBuffer(FileHandle_t file, void *buffer)
{ {
g_pFileSystem->ReleaseReadBuffer(file, buffer); g_pFileSystem->ReleaseReadBuffer(file, buffer);
} }
/* <26962> ../engine/filesystem_internal.cpp:282 */
void FS_Unlink(const char *filename) void FS_Unlink(const char *filename)
{ {
char localPath[512]; char localPath[512];
@ -340,7 +296,6 @@ void FS_Unlink(const char *filename)
_unlink(localPath); _unlink(localPath);
} }
/* <269e8> ../engine/filesystem_internal.cpp:292 */
void FS_Rename(const char *originalName, const char *newName) void FS_Rename(const char *originalName, const char *newName)
{ {
char *cut; char *cut;
@ -361,13 +316,12 @@ void FS_Rename(const char *originalName, const char *newName)
#else #else
Q_strcat(newPath, newName); Q_strcat(newPath, newName);
#endif #endif
rename(localPath, newPath); rename(localPath, newPath);
} }
} }
} }
/* <26abf> ../engine/filesystem_internal.cpp:320 */
void *FS_LoadLibrary(const char *dllName) void *FS_LoadLibrary(const char *dllName)
{ {
void *result = NULL; void *result = NULL;
@ -384,4 +338,3 @@ void *FS_LoadLibrary(const char *dllName)
return result; return result;
} }

2
rehlds/engine/filter.h
View File

@ -42,7 +42,6 @@
#define MAX_USERFILTERS 32768 #define MAX_USERFILTERS 32768
#endif // REHLDS_FIXES #endif // REHLDS_FIXES
/* <a05ba> ../engine/filter.h:12 */
typedef struct ipfilter_s typedef struct ipfilter_s
{ {
unsigned int mask; unsigned int mask;
@ -57,7 +56,6 @@ typedef struct ipfilter_s
#endif // REHLDS_FIXES #endif // REHLDS_FIXES
} ipfilter_t; } ipfilter_t;
/* <a0606> ../engine/filter.h:20 */
typedef struct userfilter_s typedef struct userfilter_s
{ {
USERID_t userid; USERID_t userid;

20
rehlds/engine/hashpak.cpp
View File

@ -45,7 +45,6 @@ hash_pack_header_t hash_pack_header;
#endif //HOOK_ENGINE #endif //HOOK_ENGINE
/* <2a7cb> ../engine/hashpak.c:65 */
qboolean HPAK_GetDataPointer(char *pakname, struct resource_s *pResource, unsigned char **pbuffer, int *bufsize) qboolean HPAK_GetDataPointer(char *pakname, struct resource_s *pResource, unsigned char **pbuffer, int *bufsize)
{ {
qboolean retval = FALSE; qboolean retval = FALSE;
@ -155,7 +154,6 @@ qboolean HPAK_GetDataPointer(char *pakname, struct resource_s *pResource, unsign
return retval; return retval;
} }
/* <2a451> ../engine/hashpak.c:217 */
qboolean HPAK_FindResource(hash_pack_directory_t *pDir, unsigned char *hash, struct resource_s *pResourceEntry) qboolean HPAK_FindResource(hash_pack_directory_t *pDir, unsigned char *hash, struct resource_s *pResourceEntry)
{ {
for (int i = 0; i < pDir->nEntries; i++) for (int i = 0; i < pDir->nEntries; i++)
@ -171,7 +169,6 @@ qboolean HPAK_FindResource(hash_pack_directory_t *pDir, unsigned char *hash, str
return FALSE; return FALSE;
} }
/* <2a916> ../engine/hashpak.c:243 */
void HPAK_AddToQueue(char *pakname, struct resource_s *pResource, void *pData, FileHandle_t fpSource) void HPAK_AddToQueue(char *pakname, struct resource_s *pResource, void *pData, FileHandle_t fpSource)
{ {
hash_pack_queue_t *n = (hash_pack_queue_t *)Mem_Malloc(sizeof(hash_pack_queue_t)); hash_pack_queue_t *n = (hash_pack_queue_t *)Mem_Malloc(sizeof(hash_pack_queue_t));
@ -202,7 +199,6 @@ void HPAK_AddToQueue(char *pakname, struct resource_s *pResource, void *pData, F
} }
} }
/* <2a955> ../engine/hashpak.c:286 */
void HPAK_FlushHostQueue(void) void HPAK_FlushHostQueue(void)
{ {
for (hash_pack_queue_t *p = gp_hpak_queue; gp_hpak_queue != NULL; p = gp_hpak_queue) for (hash_pack_queue_t *p = gp_hpak_queue; gp_hpak_queue != NULL; p = gp_hpak_queue)
@ -215,7 +211,6 @@ void HPAK_FlushHostQueue(void)
} }
} }
/* <2a494> ../engine/hashpak.c:322 */
void HPAK_AddLump(qboolean bUseQueue, char *pakname, struct resource_s *pResource, void *pData, FileHandle_t fpSource) void HPAK_AddLump(qboolean bUseQueue, char *pakname, struct resource_s *pResource, void *pData, FileHandle_t fpSource)
{ {
FileHandle_t iRead; FileHandle_t iRead;
@ -412,7 +407,6 @@ void HPAK_AddLump(qboolean bUseQueue, char *pakname, struct resource_s *pResourc
FS_Rename(szTempName, szOriginalName); FS_Rename(szTempName, szOriginalName);
} }
/* <2a974> ../engine/hashpak.c:598 */
void HPAK_RemoveLump(char *pakname, resource_t *pResource) void HPAK_RemoveLump(char *pakname, resource_t *pResource)
{ {
FileHandle_t fp; FileHandle_t fp;
@ -463,7 +457,7 @@ void HPAK_RemoveLump(char *pakname, resource_t *pResource)
FS_Close(fp); FS_Close(fp);
Con_Printf("ERROR: couldn't create %s.\n", szTempName); Con_Printf("ERROR: couldn't create %s.\n", szTempName);
return; return;
} }
FS_Seek(fp, 0, FILESYSTEM_SEEK_HEAD); FS_Seek(fp, 0, FILESYSTEM_SEEK_HEAD);
FS_Seek(tmp, 0, FILESYSTEM_SEEK_HEAD); FS_Seek(tmp, 0, FILESYSTEM_SEEK_HEAD);
FS_Read(&hash_pack_header, sizeof(hash_pack_header_t), 1, fp); FS_Read(&hash_pack_header, sizeof(hash_pack_header_t), 1, fp);
@ -549,7 +543,6 @@ void HPAK_RemoveLump(char *pakname, resource_t *pResource)
Mem_Free(newdir.p_rgEntries); Mem_Free(newdir.p_rgEntries);
} }
/* <2aac9> ../engine/hashpak.c:772 */
qboolean HPAK_ResourceForIndex(char *pakname, int nIndex, struct resource_s *pResource) qboolean HPAK_ResourceForIndex(char *pakname, int nIndex, struct resource_s *pResource)
{ {
hash_pack_header_t header; hash_pack_header_t header;
@ -609,7 +602,6 @@ qboolean HPAK_ResourceForIndex(char *pakname, int nIndex, struct resource_s *pRe
return TRUE; return TRUE;
} }
/* <2abc5> ../engine/hashpak.c:855 */
qboolean HPAK_ResourceForHash(char *pakname, unsigned char *hash, struct resource_s *pResourceEntry) qboolean HPAK_ResourceForHash(char *pakname, unsigned char *hash, struct resource_s *pResourceEntry)
{ {
qboolean bFound; qboolean bFound;
@ -675,7 +667,6 @@ qboolean HPAK_ResourceForHash(char *pakname, unsigned char *hash, struct resourc
return bFound; return bFound;
} }
/* <2a644> ../engine/hashpak.c:945 */
void HPAK_List_f(void) void HPAK_List_f(void)
{ {
hash_pack_header_t header; hash_pack_header_t header;
@ -765,7 +756,6 @@ void HPAK_List_f(void)
Mem_Free(directory.p_rgEntries); Mem_Free(directory.p_rgEntries);
} }
/* <2a121> ../engine/hashpak.c:1060 */
void HPAK_CreatePak(char *pakname, struct resource_s *pResource, void *pData, FileHandle_t fpSource) void HPAK_CreatePak(char *pakname, struct resource_s *pResource, void *pData, FileHandle_t fpSource)
{ {
char name[MAX_PATH]; char name[MAX_PATH];
@ -866,7 +856,6 @@ void HPAK_CreatePak(char *pakname, struct resource_s *pResource, void *pData, Fi
FS_Close(fp); FS_Close(fp);
} }
/* <2ab62> ../engine/hashpak.c:1200 */
void HPAK_Remove_f(void) void HPAK_Remove_f(void)
{ {
int nIndex; int nIndex;
@ -892,7 +881,6 @@ void HPAK_Remove_f(void)
else Con_Printf("Could not locate resource %i in %s\n", nIndex, pakname); else Con_Printf("Could not locate resource %i in %s\n", nIndex, pakname);
} }
/* <2a3cb> ../engine/hashpak.c:1235 */
void HPAK_Validate_f(void) void HPAK_Validate_f(void)
{ {
hash_pack_header_t header; hash_pack_header_t header;
@ -1024,7 +1012,6 @@ void HPAK_Validate_f(void)
Mem_Free(directory.p_rgEntries); Mem_Free(directory.p_rgEntries);
} }
/* <2a33c> ../engine/hashpak.c:1401 */
void HPAK_Extract_f(void) void HPAK_Extract_f(void)
{ {
hash_pack_header_t header; hash_pack_header_t header;
@ -1170,7 +1157,6 @@ void HPAK_Extract_f(void)
Mem_Free(directory.p_rgEntries); Mem_Free(directory.p_rgEntries);
} }
/* <2ae78> ../engine/hashpak.c:1580 */
void HPAK_Init(void) void HPAK_Init(void)
{ {
#ifdef HOOK_ENGINE #ifdef HOOK_ENGINE
@ -1187,7 +1173,6 @@ void HPAK_Init(void)
gp_hpak_queue = NULL; gp_hpak_queue = NULL;
} }
/* <2ae8e> ../engine/hashpak.c:1599 */
NOXREF char *HPAK_GetItem(int item) NOXREF char *HPAK_GetItem(int item)
{ {
NOXREFCHECK; NOXREFCHECK;
@ -1244,7 +1229,6 @@ NOXREF char *HPAK_GetItem(int item)
return name; return name;
} }
/* <2af4b> ../engine/hashpak.c:1678 */
void HPAK_CheckSize(char *pakname) void HPAK_CheckSize(char *pakname)
{ {
char fullname[MAX_PATH]; char fullname[MAX_PATH];
@ -1288,7 +1272,6 @@ void HPAK_CheckSize(char *pakname)
} }
} }
/* <2afb5> ../engine/hashpak.c:1728 */
void HPAK_ValidatePak(char *fullpakname) void HPAK_ValidatePak(char *fullpakname)
{ {
hash_pack_header_t header; hash_pack_header_t header;
@ -1374,7 +1357,6 @@ void HPAK_ValidatePak(char *fullpakname)
Mem_Free(directory.p_rgEntries); Mem_Free(directory.p_rgEntries);
} }
/* <2b0b6> ../engine/hashpak.c:1848 */
void HPAK_CheckIntegrity(char *pakname) void HPAK_CheckIntegrity(char *pakname)
{ {
char name[256]; char name[256];

10
rehlds/engine/hashpak.h
View File

@ -39,10 +39,9 @@
#define HASHPAK_EXTENSION ".hpk" #define HASHPAK_EXTENSION ".hpk"
#define HASHPAK_VERSION 0x0001 #define HASHPAK_VERSION 0x0001
#define MAX_FILE_SIZE 0x20000 /* size: 131072 */ #define MAX_FILE_SIZE 0x20000
#define MAX_FILE_ENTRIES 0x8000 /* size: 32768 */ #define MAX_FILE_ENTRIES 0x8000
/* <29eca> ../engine/hashpak.c:40 */
typedef struct hash_pack_queue_s typedef struct hash_pack_queue_s
{ {
char *pakname; char *pakname;
@ -52,7 +51,6 @@ typedef struct hash_pack_queue_s
struct hash_pack_queue_s *next; struct hash_pack_queue_s *next;
} hash_pack_queue_t; } hash_pack_queue_t;
/* <29e0a> ../engine/hashpak.c:20 */
typedef struct hash_pack_entry_s typedef struct hash_pack_entry_s
{ {
resource_t resource; resource_t resource;
@ -60,14 +58,12 @@ typedef struct hash_pack_entry_s
int nFileLength; int nFileLength;
} hash_pack_entry_t; } hash_pack_entry_t;
/* <29e4e> ../engine/hashpak.c:27 */
typedef struct hash_pack_directory_s typedef struct hash_pack_directory_s
{ {
int nEntries; int nEntries;
hash_pack_entry_t *p_rgEntries; hash_pack_entry_t *p_rgEntries;
} hash_pack_directory_t; } hash_pack_directory_t;
/* <29e88> ../engine/hashpak.c:33 */
typedef struct hash_pack_header_s typedef struct hash_pack_header_s
{ {
char szFileStamp[4]; char szFileStamp[4];
@ -83,7 +79,7 @@ typedef struct hash_pack_header_s
extern hash_pack_queue_t *gp_hpak_queue; extern hash_pack_queue_t *gp_hpak_queue;
//TODO: used only in hashpak // TODO: used only in hashpak
extern hash_pack_directory_t hash_pack_dir; extern hash_pack_directory_t hash_pack_dir;
extern hash_pack_header_t hash_pack_header; extern hash_pack_header_t hash_pack_header;

42
rehlds/engine/host.cpp
View File

@ -33,7 +33,7 @@ double rolling_fps;
quakeparms_t host_parms; quakeparms_t host_parms;
qboolean host_initialized; qboolean host_initialized;
double host_frametime; double host_frametime;
//short unsigned int *host_basepal; //unsigned short *host_basepal;
int host_framecount; int host_framecount;
//int minimum_memory; //int minimum_memory;
client_t *host_client; client_t *host_client;
@ -71,7 +71,7 @@ cvar_t host_framerate = { "host_framerate", "0", 0, 0.0f, NULL };
cvar_t pausable = { "pausable", "1", FCVAR_SERVER, 0.0f, NULL }; cvar_t pausable = { "pausable", "1", FCVAR_SERVER, 0.0f, NULL };
cvar_t suitvolume = { "suitvolume", "0.25", FCVAR_ARCHIVE, 0.0f, NULL }; cvar_t suitvolume = { "suitvolume", "0.25", FCVAR_ARCHIVE, 0.0f, NULL };
#else //HOOK_ENGINE #else // HOOK_ENGINE
cvar_t host_name; cvar_t host_name;
cvar_t host_speeds; cvar_t host_speeds;
@ -92,9 +92,8 @@ cvar_t host_framerate;
cvar_t pausable; cvar_t pausable;
cvar_t suitvolume; cvar_t suitvolume;
#endif //HOOK_ENGINE #endif // HOOK_ENGINE
/* <3617e> ../engine/host.c:201 */
NOXREF void Host_EndGame(const char *message, ...) NOXREF void Host_EndGame(const char *message, ...)
{ {
int oldn; int oldn;
@ -133,7 +132,6 @@ NOXREF void Host_EndGame(const char *message, ...)
longjmp(host_abortserver, 1); longjmp(host_abortserver, 1);
} }
/* <36123> ../engine/host.c:255 */
void __declspec(noreturn) Host_Error(const char *error, ...) void __declspec(noreturn) Host_Error(const char *error, ...)
{ {
va_list argptr; va_list argptr;
@ -167,7 +165,6 @@ void __declspec(noreturn) Host_Error(const char *error, ...)
Sys_Error(__FUNCTION__ ": %s\n", string); Sys_Error(__FUNCTION__ ": %s\n", string);
} }
/* <35d12> ../engine/host.c:297 */
void Host_InitLocal(void) void Host_InitLocal(void)
{ {
Host_InitCommands(); Host_InitCommands();
@ -198,7 +195,6 @@ void Host_InitLocal(void)
SV_SetMaxclients(); SV_SetMaxclients();
} }
/* <35d28> ../engine/host.c:349 */
NOXREF void Info_WriteVars(FileHandle_t fp) NOXREF void Info_WriteVars(FileHandle_t fp)
{ {
cvar_t *pcvar; cvar_t *pcvar;
@ -249,7 +245,6 @@ NOXREF void Info_WriteVars(FileHandle_t fp)
} }
} }
/* <35dc8> ../engine/host.c:409 */
void Host_WriteConfiguration(void) void Host_WriteConfiguration(void)
{ {
#ifndef SWDS #ifndef SWDS
@ -323,7 +318,6 @@ void Host_WriteConfiguration(void)
#endif // SWDS #endif // SWDS
} }
/* <35df2> ../engine/host.c:516 */
void Host_WriteCustomConfig(void) void Host_WriteCustomConfig(void)
{ {
#ifndef SWDS #ifndef SWDS
@ -381,7 +375,6 @@ void Host_WriteCustomConfig(void)
#endif // SWDS #endif // SWDS
} }
/* <35e4e> ../engine/host.c:594 */
void SV_ClientPrintf(const char *fmt, ...) void SV_ClientPrintf(const char *fmt, ...)
{ {
va_list va; va_list va;
@ -400,7 +393,6 @@ void SV_ClientPrintf(const char *fmt, ...)
} }
} }
/* <35eaa> ../engine/host.c:617 */
void SV_BroadcastPrintf(const char *fmt, ...) void SV_BroadcastPrintf(const char *fmt, ...)
{ {
va_list argptr; va_list argptr;
@ -424,7 +416,6 @@ void SV_BroadcastPrintf(const char *fmt, ...)
Con_DPrintf("%s", string); Con_DPrintf("%s", string);
} }
/* <35f03> ../engine/host.c:646 */
void Host_ClientCommands(const char *fmt, ...) void Host_ClientCommands(const char *fmt, ...)
{ {
va_list argptr; va_list argptr;
@ -471,7 +462,6 @@ void SV_DropClient(client_t *cl, qboolean crash, const char *fmt, ...)
g_RehldsHookchains.m_SV_DropClient.callChain(SV_DropClient_hook, GetRehldsApiClient(cl), crash != FALSE, buf); g_RehldsHookchains.m_SV_DropClient.callChain(SV_DropClient_hook, GetRehldsApiClient(cl), crash != FALSE, buf);
} }
/* <35f4e> ../engine/host.c:673 */
void SV_DropClient_internal(client_t *cl, qboolean crash, const char *string) void SV_DropClient_internal(client_t *cl, qboolean crash, const char *string)
{ {
int i; int i;
@ -540,7 +530,6 @@ void SV_DropClient_internal(client_t *cl, qboolean crash, const char *string)
NotifyDedicatedServerUI("UpdatePlayers"); NotifyDedicatedServerUI("UpdatePlayers");
} }
/* <35cc8> ../engine/host.c:763 */
void Host_ClearClients(qboolean bFramesOnly) void Host_ClearClients(qboolean bFramesOnly)
{ {
int i; int i;
@ -581,7 +570,6 @@ void Host_ClearClients(qboolean bFramesOnly)
} }
} }
/* <3605a> ../engine/host.c:815 */
void Host_ShutdownServer(qboolean crash) void Host_ShutdownServer(qboolean crash)
{ {
int i; int i;
@ -620,7 +608,6 @@ void Host_ShutdownServer(qboolean crash)
Log_Close(); Log_Close();
} }
/* <361d4> ../engine/host.c:924 */
void SV_ClearClientStates(void) void SV_ClearClientStates(void)
{ {
int i; int i;
@ -633,7 +620,6 @@ void SV_ClearClientStates(void)
} }
} }
/* <361fc> ../engine/host.c:942 */
void Host_CheckDyanmicStructures(void) void Host_CheckDyanmicStructures(void)
{ {
int i; int i;
@ -647,7 +633,6 @@ void Host_CheckDyanmicStructures(void)
} }
} }
/* <36249> ../engine/host.c:970 */
void Host_ClearMemory(qboolean bQuiet) void Host_ClearMemory(qboolean bQuiet)
{ {
@ -677,7 +662,6 @@ void Host_ClearMemory(qboolean bQuiet)
SV_ClearClientStates(); SV_ClearClientStates();
} }
/* <362d1> ../engine/host.c:1003 */
qboolean Host_FilterTime(float time) qboolean Host_FilterTime(float time)
{ {
float fps; float fps;
@ -750,26 +734,22 @@ qboolean Host_FilterTime(float time)
return TRUE; return TRUE;
} }
/* <36351> ../engine/host.c:1100 */
qboolean Master_IsLanGame(void) qboolean Master_IsLanGame(void)
{ {
return sv_lan.value != 0.0f; return sv_lan.value != 0.0f;
} }
/* <3636a> ../engine/host.c:1116 */
void Master_Heartbeat_f(void) void Master_Heartbeat_f(void)
{ {
//Steam_ForceHeartbeat in move? //Steam_ForceHeartbeat in move?
CRehldsPlatformHolder::get()->SteamGameServer()->ForceHeartbeat(); CRehldsPlatformHolder::get()->SteamGameServer()->ForceHeartbeat();
} }
/* <3637f> ../engine/host.c:1130 */
void Host_ComputeFPS(double frametime) void Host_ComputeFPS(double frametime)
{ {
rolling_fps = 0.6 * rolling_fps + 0.4 * frametime; rolling_fps = 0.6 * rolling_fps + 0.4 * frametime;
} }
/* <3639c> ../engine/host.c:1140 */
void Host_GetHostInfo(float *fps, int *nActive, int *unused, int *nMaxPlayers, char *pszMap) void Host_GetHostInfo(float *fps, int *nActive, int *unused, int *nMaxPlayers, char *pszMap)
{ {
if (rolling_fps > 0.0) if (rolling_fps > 0.0)
@ -804,7 +784,6 @@ void Host_GetHostInfo(float *fps, int *nActive, int *unused, int *nMaxPlayers, c
*nMaxPlayers = g_psvs.maxclients; *nMaxPlayers = g_psvs.maxclients;
} }
/* <36411> ../engine/host.c:1174 */
void Host_Speeds(double *time) void Host_Speeds(double *time)
{ {
float pass1, pass2, pass3, pass4, pass5; float pass1, pass2, pass3, pass4, pass5;
@ -851,7 +830,6 @@ void Host_Speeds(double *time)
#endif // SWDS #endif // SWDS
} }
/* <36495> ../engine/host.c:1231 */
void Host_UpdateScreen(void) void Host_UpdateScreen(void)
{ {
if (!gfBackground) if (!gfBackground)
@ -865,7 +843,6 @@ void Host_UpdateScreen(void)
} }
} }
/* <364b1> ../engine/host.c:1288 */
void Host_UpdateSounds(void) void Host_UpdateSounds(void)
{ {
if (!gfBackground) if (!gfBackground)
@ -874,7 +851,6 @@ void Host_UpdateSounds(void)
} }
} }
/* <364dd> ../engine/host.c:1320 */
void Host_CheckConnectionFailure(void) void Host_CheckConnectionFailure(void)
{ {
static int frames = 5; static int frames = 5;
@ -888,10 +864,9 @@ void Host_CheckConnectionFailure(void)
} }
} }
/* <364fd> ../engine/host.c:1350 */
void _Host_Frame(float time) void _Host_Frame(float time)
{ {
static double host_times[6]; static double host_times[6];
if (setjmp(host_enddemo)) if (setjmp(host_enddemo))
@ -977,7 +952,6 @@ void _Host_Frame(float time)
#endif //REHLDS_FLIGHT_REC #endif //REHLDS_FLIGHT_REC
} }
/* <36628> ../engine/host.c:1501 */
int Host_Frame(float time, int iState, int *stateInfo) int Host_Frame(float time, int iState, int *stateInfo)
{ {
double time1; double time1;
@ -1032,7 +1006,6 @@ int Host_Frame(float time, int iState, int *stateInfo)
return giActive; return giActive;
} }
/* <3672c> ../engine/host.c:1577 */
void CheckGore(void) void CheckGore(void)
{ {
if (bLowViolenceBuild) if (bLowViolenceBuild)
@ -1051,7 +1024,6 @@ void CheckGore(void)
} }
} }
/* <35bad> ../engine/host.c:1649 */
qboolean Host_IsSinglePlayerGame(void) qboolean Host_IsSinglePlayerGame(void)
{ {
if (g_psv.active) if (g_psv.active)
@ -1061,13 +1033,11 @@ qboolean Host_IsSinglePlayerGame(void)
} }
/* <3676e> ../engine/host.c:1656 */
qboolean Host_IsServerActive(void) qboolean Host_IsServerActive(void)
{ {
return g_psv.active; return g_psv.active;
} }
/* <36787> ../engine/host.c:1664 */
void Host_Version(void) void Host_Version(void)
{ {
char szFileName[MAX_PATH]; char szFileName[MAX_PATH];
@ -1085,7 +1055,7 @@ void Host_Version(void)
FS_Close(fp); FS_Close(fp);
buffer[bufsize] = 0; buffer[bufsize] = 0;
int gotKeys = 0; int gotKeys = 0;
pbuf = COM_Parse(pbuf); pbuf = COM_Parse(pbuf);
if (pbuf) if (pbuf)
{ {
@ -1132,7 +1102,6 @@ void Host_Version(void)
} }
} }
/* <36823> ../engine/host.c:1764 */
int Host_Init(quakeparms_t *parms) int Host_Init(quakeparms_t *parms)
{ {
char versionString[256]; char versionString[256];
@ -1252,7 +1221,6 @@ int Host_Init(quakeparms_t *parms)
return 1; return 1;
} }
/* <368c2> ../engine/host.c:1977 */
void Host_Shutdown(void) void Host_Shutdown(void)
{ {
static qboolean isdown = FALSE; static qboolean isdown = FALSE;

9
rehlds/engine/host.h
View File

@ -38,10 +38,8 @@
#include "server.h" #include "server.h"
#include "rehlds_api.h" #include "rehlds_api.h"
#define MAX_COMMAND_LINE_PARAMS 50 #define MAX_COMMAND_LINE_PARAMS 50
/* <271d2> ../engine/host.h:19 */
typedef struct quakeparms_s typedef struct quakeparms_s
{ {
char *basedir; char *basedir;
@ -69,7 +67,6 @@ typedef struct quakeparms_s
#define fps_override (*pfps_override) #define fps_override (*pfps_override)
#define host_framerate (*phost_framerate) #define host_framerate (*phost_framerate)
#define pausable (*ppausable) #define pausable (*ppausable)
#define suitvolume (*psuitvolume) #define suitvolume (*psuitvolume)
#define realtime (*prealtime) #define realtime (*prealtime)
@ -77,9 +74,7 @@ typedef struct quakeparms_s
#define host_parms (*phost_parms) #define host_parms (*phost_parms)
#define host_initialized (*phost_initialized) #define host_initialized (*phost_initialized)
#define host_frametime (*phost_frametime) #define host_frametime (*phost_frametime)
#define host_framecount (*phost_framecount) #define host_framecount (*phost_framecount)
#define host_client (*phost_client) #define host_client (*phost_client)
#define gfNoMasterServer (*pgfNoMasterServer) #define gfNoMasterServer (*pgfNoMasterServer)
#define oldrealtime (*poldrealtime) #define oldrealtime (*poldrealtime)
@ -105,7 +100,6 @@ extern cvar_t sv_stats;
extern cvar_t fps_override; extern cvar_t fps_override;
extern cvar_t host_framerate; extern cvar_t host_framerate;
extern cvar_t pausable; extern cvar_t pausable;
extern cvar_t suitvolume; extern cvar_t suitvolume;
extern double realtime; extern double realtime;
@ -113,9 +107,7 @@ extern double rolling_fps;
extern quakeparms_t host_parms; extern quakeparms_t host_parms;
extern qboolean host_initialized; extern qboolean host_initialized;
extern double host_frametime; extern double host_frametime;
extern int host_framecount; extern int host_framecount;
extern client_t *host_client; extern client_t *host_client;
extern qboolean gfNoMasterServer; extern qboolean gfNoMasterServer;
extern double oldrealtime; extern double oldrealtime;
@ -124,7 +116,6 @@ extern jmp_buf host_abortserver;
extern jmp_buf host_enddemo; extern jmp_buf host_enddemo;
extern unsigned short *host_basepal; extern unsigned short *host_basepal;
NOXREF void Host_EndGame(const char *message, ...); NOXREF void Host_EndGame(const char *message, ...);
void __declspec(noreturn) Host_Error(const char *error, ...); void __declspec(noreturn) Host_Error(const char *error, ...);
void Host_InitLocal(void); void Host_InitLocal(void);

119
rehlds/engine/host_cmd.cpp
View File

@ -28,7 +28,6 @@
#include "precompiled.h" #include "precompiled.h"
/* <3d3ff> ../engine/host_cmd.c:4378 */
typedef int(*SV_BLENDING_INTERFACE_FUNC)(int, struct sv_blending_interface_s **, struct server_studio_api_s *, float *, float *); typedef int(*SV_BLENDING_INTERFACE_FUNC)(int, struct sv_blending_interface_s **, struct server_studio_api_s *, float *, float *);
vec3_t r_origin; vec3_t r_origin;
@ -44,7 +43,6 @@ qboolean g_bMajorMapChange;
int g_iQuitCommandIssued; int g_iQuitCommandIssued;
char *g_pPostRestartCmdLineArgs; char *g_pPostRestartCmdLineArgs;
/* /*
* Globals initialization * Globals initialization
*/ */
@ -127,13 +125,13 @@ TITLECOMMENT gTitleComments[] =
{ "ba_teleport", "#BA_TELEPORTTITLE" }, { "ba_teleport", "#BA_TELEPORTTITLE" },
{ "ba_outro", "#BA_OUTRO" } { "ba_outro", "#BA_OUTRO" }
}; };
TYPEDESCRIPTION gGameHeaderDescription[] = TYPEDESCRIPTION gGameHeaderDescription[] =
{ {
DEFINE_FIELD(GAME_HEADER, mapCount, FIELD_INTEGER), DEFINE_FIELD(GAME_HEADER, mapCount, FIELD_INTEGER),
DEFINE_ARRAY(GAME_HEADER, mapName, FIELD_CHARACTER, 32), DEFINE_ARRAY(GAME_HEADER, mapName, FIELD_CHARACTER, 32),
DEFINE_ARRAY(GAME_HEADER, comment, FIELD_CHARACTER, 80), DEFINE_ARRAY(GAME_HEADER, comment, FIELD_CHARACTER, 80),
}; };
TYPEDESCRIPTION gSaveHeaderDescription[] = TYPEDESCRIPTION gSaveHeaderDescription[] =
{ {
DEFINE_FIELD(SAVE_HEADER, skillLevel, FIELD_INTEGER), DEFINE_FIELD(SAVE_HEADER, skillLevel, FIELD_INTEGER),
DEFINE_FIELD(SAVE_HEADER, entityCount, FIELD_INTEGER), DEFINE_FIELD(SAVE_HEADER, entityCount, FIELD_INTEGER),
@ -170,7 +168,7 @@ TYPEDESCRIPTION gLightstyleDescription[] =
DEFINE_ARRAY(SAVELIGHTSTYLE, style, FIELD_CHARACTER, MAX_LIGHTSTYLES), DEFINE_ARRAY(SAVELIGHTSTYLE, style, FIELD_CHARACTER, MAX_LIGHTSTYLES),
}; };
#else //HOOK_ENGINE #else // HOOK_ENGINE
int r_dointerp; int r_dointerp;
@ -187,21 +185,18 @@ TYPEDESCRIPTION gAdjacencyDescription[4];
TYPEDESCRIPTION gEntityTableDescription[5]; TYPEDESCRIPTION gEntityTableDescription[5];
TYPEDESCRIPTION gLightstyleDescription[2]; TYPEDESCRIPTION gLightstyleDescription[2];
#endif //HOOK_ENGINE #endif // HOOK_ENGINE
/* <3e21d> ../engine/host_cmd.c:192 */
void SV_GetPlayerHulls(void) void SV_GetPlayerHulls(void)
{ {
int i; int i;
//int iResult;//unused?
for (i = 0; i < 4; i++) for (i = 0; i < 4; i++)
{ {
if (!gEntityInterface.pfnGetHullBounds(i, player_mins[i], player_maxs[i])) if (!gEntityInterface.pfnGetHullBounds(i, player_mins[i], player_maxs[i]))
break; break;
} }
} }
/* <3e298> ../engine/host_cmd.c:216 */
void Host_InitializeGameDLL(void) void Host_InitializeGameDLL(void)
{ {
Cbuf_Execute(); Cbuf_Execute();
@ -226,7 +221,6 @@ void Host_InitializeGameDLL(void)
Cbuf_Execute(); Cbuf_Execute();
} }
/* <3d608> ../engine/host_cmd.c:271 */
void Host_Motd_f(void) void Host_Motd_f(void)
{ {
int length; int length;
@ -273,7 +267,6 @@ void Host_Motd_f(void)
FS_Close(pFile); FS_Close(pFile);
} }
/* <3d5d4> ../engine/host_cmd.c:335 */
void Host_Motd_Write_f(void) void Host_Motd_Write_f(void)
{ {
char newFile[2048] = ""; char newFile[2048] = "";
@ -318,13 +311,11 @@ void Host_Motd_Write_f(void)
Con_Printf("Done.\n"); Con_Printf("Done.\n");
} }
/* <3e382> ../engine/host_cmd.c:395 */
int Host_GetStartTime(void) int Host_GetStartTime(void)
{ {
return startTime; return startTime;
} }
/* <3e39a> ../engine/host_cmd.c:405 */
void Host_UpdateStats(void) void Host_UpdateStats(void)
{ {
uint32 runticks = 0; uint32 runticks = 0;
@ -368,7 +359,7 @@ void Host_UpdateStats(void)
runticks = (uint32)(lastcputicks >> 32); runticks = (uint32)(lastcputicks >> 32);
} }
cpuPercent = cpuPercent =
(FILETIME_TO_QWORD(UserTime) + FILETIME_TO_QWORD(KernelTime) - lastrunticks) (FILETIME_TO_QWORD(UserTime) + FILETIME_TO_QWORD(KernelTime) - lastrunticks)
/ (FILETIME_TO_QWORD(SystemTimeAsFileTime) / (FILETIME_TO_QWORD(SystemTimeAsFileTime)
- (double)FILETIME_TO_PAIR(runticks, cputicks)); - (double)FILETIME_TO_PAIR(runticks, cputicks));
@ -447,7 +438,6 @@ void Host_UpdateStats(void)
#endif // _WIN32 #endif // _WIN32
} }
/* <3da03> ../engine/host_cmd.c:580 */
void GetStatsString(char *buf, int bufSize) void GetStatsString(char *buf, int bufSize)
{ {
long double avgOut = 0.0; long double avgOut = 0.0;
@ -476,7 +466,6 @@ void GetStatsString(char *buf, int bufSize)
buf[bufSize - 1] = 0; buf[bufSize - 1] = 0;
} }
/* <3e059> ../engine/host_cmd.c:613 */
void Host_Stats_f(void) void Host_Stats_f(void)
{ {
char stats[512]; char stats[512];
@ -484,7 +473,6 @@ void Host_Stats_f(void)
Con_Printf("CPU In Out Uptime Users FPS Players\n%s\n", stats); Con_Printf("CPU In Out Uptime Users FPS Players\n%s\n", stats);
} }
/* <3d5c9> ../engine/host_cmd.c:626 */
void Host_Quit_f(void) void Host_Quit_f(void)
{ {
if (Cmd_Argc() == 1) if (Cmd_Argc() == 1)
@ -505,7 +493,6 @@ void Host_Quit_f(void)
} }
} }
/* <3d5be> ../engine/host_cmd.c:651 */
void Host_Quit_Restart_f(void) void Host_Quit_Restart_f(void)
{ {
giActive = DLL_RESTART; giActive = DLL_RESTART;
@ -531,7 +518,7 @@ void Host_Quit_Restart_f(void)
} }
} }
/* <3e511> ../engine/host_cmd.c:700 */
void Host_Status_Printf(qboolean conprint, qboolean log, char *fmt, ...) void Host_Status_Printf(qboolean conprint, qboolean log, char *fmt, ...)
{ {
va_list argptr; va_list argptr;
@ -554,7 +541,6 @@ void Host_Status_Printf(qboolean conprint, qboolean log, char *fmt, ...)
} }
} }
/* <3e666> ../engine/host_cmd.c:735 */
void Host_Status_f(void) void Host_Status_f(void)
{ {
client_t *client; client_t *client;
@ -693,7 +679,6 @@ void Host_Status_f(void)
Host_Status_Printf(conprint, log, "%i users\n", nClients); Host_Status_Printf(conprint, log, "%i users\n", nClients);
} }
/* <3e594> ../engine/host_cmd.c:923 */
void Host_Status_Formatted_f(void) void Host_Status_Formatted_f(void)
{ {
client_t *client; client_t *client;
@ -787,7 +772,6 @@ void Host_Status_Formatted_f(void)
Host_Status_Printf(conprint, log, "%i users\n", nClients); Host_Status_Printf(conprint, log, "%i users\n", nClients);
} }
/* <3dc0c> ../engine/host_cmd.c:1219 */
void Host_Ping_f(void) void Host_Ping_f(void)
{ {
int i; int i;
@ -808,7 +792,6 @@ void Host_Ping_f(void)
} }
} }
/* <3fc89> ../engine/host_cmd.c:1249 */
void Host_Map(qboolean bIsDemo, char *mapstring, char *mapName, qboolean loadGame) void Host_Map(qboolean bIsDemo, char *mapstring, char *mapName, qboolean loadGame)
{ {
int i; int i;
@ -868,7 +851,6 @@ void Host_Map(qboolean bIsDemo, char *mapstring, char *mapName, qboolean loadGam
} }
} }
/* <3ff7f> ../engine/host_cmd.c:1339 */
void Host_Map_f(void) void Host_Map_f(void)
{ {
int i; int i;
@ -914,7 +896,7 @@ void Host_Map_f(void)
if (!g_psvs.dll_initialized) if (!g_psvs.dll_initialized)
Host_InitializeGameDLL(); Host_InitializeGameDLL();
int iLen = Q_strlen(name); int iLen = Q_strlen(name);
if (iLen > 4 && !Q_stricmp(&name[iLen - 4], ".bsp")) if (iLen > 4 && !Q_stricmp(&name[iLen - 4], ".bsp"))
name[iLen - 4] = 0; name[iLen - 4] = 0;
@ -960,7 +942,6 @@ void Host_Map_f(void)
SetCareerAudioState(0); SetCareerAudioState(0);
} }
/* <4004e> ../engine/host_cmd.c:1475 */
void Host_Career_f(void) void Host_Career_f(void)
{ {
if (cmd_source == src_command) if (cmd_source == src_command)
@ -970,7 +951,6 @@ void Host_Career_f(void)
} }
} }
/* <3d5a2> ../engine/host_cmd.c:1493 */
void Host_Maps_f(void) void Host_Maps_f(void)
{ {
char *pszSubString; char *pszSubString;
@ -988,7 +968,6 @@ void Host_Maps_f(void)
} }
} }
/* <3d56e> ../engine/host_cmd.c:1521 */
void Host_Changelevel_f(void) void Host_Changelevel_f(void)
{ {
char _level[64]; char _level[64];
@ -1035,7 +1014,6 @@ void Host_Changelevel_f(void)
SV_ActivateServer(1); SV_ActivateServer(1);
} }
/* <3e7c9> ../engine/host_cmd.c:1581 */
const char *Host_FindRecentSave(char *pNameBuf) const char *Host_FindRecentSave(char *pNameBuf)
{ {
const char *findfn; const char *findfn;
@ -1073,7 +1051,6 @@ const char *Host_FindRecentSave(char *pNameBuf)
return found != 0 ? pNameBuf : NULL; return found != 0 ? pNameBuf : NULL;
} }
/* <3fc40> ../engine/host_cmd.c:1637 */
void Host_Restart_f(void) void Host_Restart_f(void)
{ {
char name[MAX_PATH]; char name[MAX_PATH];
@ -1093,7 +1070,6 @@ void Host_Restart_f(void)
SV_ActivateServer(1); SV_ActivateServer(1);
} }
/* <3d784> ../engine/host_cmd.c:1681 */
void Host_Reload_f(void) void Host_Reload_f(void)
{ {
const char *pSaveName; const char *pSaveName;
@ -1114,7 +1090,6 @@ void Host_Reload_f(void)
} }
} }
/* <3d552> ../engine/host_cmd.c:1730 */
void Host_Reconnect_f(void) void Host_Reconnect_f(void)
{ {
char cmdString[128]; char cmdString[128];
@ -1139,7 +1114,6 @@ void Host_Reconnect_f(void)
MSG_WriteString(&g_pcls.netchan.message, "new"); MSG_WriteString(&g_pcls.netchan.message, "new");
} }
/* <3e7a9> ../engine/host_cmd.c:1780 */
char *Host_SaveGameDirectory(void) char *Host_SaveGameDirectory(void)
{ {
static char szDirectory[MAX_PATH]; static char szDirectory[MAX_PATH];
@ -1148,7 +1122,6 @@ char *Host_SaveGameDirectory(void)
return szDirectory; return szDirectory;
} }
/* <3dba5> ../engine/host_cmd.c:1877 */
void Host_SavegameComment(char *pszBuffer, int iSizeBuffer) void Host_SavegameComment(char *pszBuffer, int iSizeBuffer)
{ {
int i; int i;
@ -1173,7 +1146,6 @@ void Host_SavegameComment(char *pszBuffer, int iSizeBuffer)
pszBuffer[iSizeBuffer - 1] = 0; pszBuffer[iSizeBuffer - 1] = 0;
} }
/* <3e8e9> ../engine/host_cmd.c:1909 */
void Host_SaveAgeList(const char *pName, int count) void Host_SaveAgeList(const char *pName, int count)
{ {
char newName[MAX_PATH]; char newName[MAX_PATH];
@ -1198,12 +1170,11 @@ void Host_SaveAgeList(const char *pName, int count)
} }
} }
/* <3e9ba> ../engine/host_cmd.c:1938 */
int Host_ValidSave(void) int Host_ValidSave(void)
{ {
if (cmd_source != src_command) if (cmd_source != src_command)
return 0; return 0;
if (!g_psv.active) if (!g_psv.active)
{ {
Con_Printf("Not playing a local game.\n"); Con_Printf("Not playing a local game.\n");
@ -1232,7 +1203,6 @@ int Host_ValidSave(void)
return 1; return 1;
} }
/* <3da59> ../engine/host_cmd.c:1983 */
SAVERESTOREDATA *SaveInit(int size) SAVERESTOREDATA *SaveInit(int size)
{ {
int i; int i;
@ -1279,7 +1249,6 @@ SAVERESTOREDATA *SaveInit(int size)
return pSaveData; return pSaveData;
} }
/* <3e17e> ../engine/host_cmd.c:2029 */
void SaveExit(SAVERESTOREDATA *save) void SaveExit(SAVERESTOREDATA *save)
{ {
if (save->pTokens) if (save->pTokens)
@ -1292,7 +1261,6 @@ void SaveExit(SAVERESTOREDATA *save)
gGlobalVariables.pSaveData = NULL; gGlobalVariables.pSaveData = NULL;
} }
/* <3f65f> ../engine/host_cmd.c:2044 */
qboolean SaveGameSlot(const char *pSaveName, const char *pSaveComment) qboolean SaveGameSlot(const char *pSaveName, const char *pSaveComment)
{ {
char hlPath[256]; char hlPath[256];
@ -1387,7 +1355,6 @@ qboolean SaveGameSlot(const char *pSaveName, const char *pSaveComment)
return TRUE; return TRUE;
} }
/* <3dadd> ../engine/host_cmd.c:2150 */
void Host_Savegame_f(void) void Host_Savegame_f(void)
{ {
char szComment[80]; char szComment[80];
@ -1412,7 +1379,6 @@ void Host_Savegame_f(void)
CL_HudMessage("GAMESAVED"); CL_HudMessage("GAMESAVED");
} }
/* <3d704> ../engine/host_cmd.c:2185 */
void Host_AutoSave_f(void) void Host_AutoSave_f(void)
{ {
char szComment[80]; char szComment[80];
@ -1427,7 +1393,6 @@ void Host_AutoSave_f(void)
} }
} }
/* <3f8d1> ../engine/host_cmd.c:2203 */
qboolean SaveGame(const char *pszSlot, const char *pszComment) qboolean SaveGame(const char *pszSlot, const char *pszComment)
{ {
qboolean qret; qboolean qret;
@ -1440,7 +1405,6 @@ qboolean SaveGame(const char *pszSlot, const char *pszComment)
return qret; return qret;
} }
/* <3d658> ../engine/host_cmd.c:2217 */
int SaveReadHeader(FileHandle_t pFile, GAME_HEADER *pHeader, int readGlobalState) int SaveReadHeader(FileHandle_t pFile, GAME_HEADER *pHeader, int readGlobalState)
{ {
int i; int i;
@ -1508,7 +1472,6 @@ int SaveReadHeader(FileHandle_t pFile, GAME_HEADER *pHeader, int readGlobalState
return 1; return 1;
} }
/* <3ea80> ../engine/host_cmd.c:2289 */
void SaveReadComment(FileHandle_t f, char *name) void SaveReadComment(FileHandle_t f, char *name)
{ {
GAME_HEADER gameHeader; GAME_HEADER gameHeader;
@ -1516,7 +1479,6 @@ void SaveReadComment(FileHandle_t f, char *name)
Q_strcpy(name, gameHeader.comment); Q_strcpy(name, gameHeader.comment);
} }
/* <3d97a> ../engine/host_cmd.c:2302 */
void Host_Loadgame_f(void) void Host_Loadgame_f(void)
{ {
if (cmd_source != src_command) if (cmd_source != src_command)
@ -1531,7 +1493,6 @@ void Host_Loadgame_f(void)
Con_Printf("Error loading saved game\n"); Con_Printf("Error loading saved game\n");
} }
/* <3fe89> ../engine/host_cmd.c:2323 */
int LoadGame(const char *pName) int LoadGame(const char *pName)
{ {
int iRet; int iRet;
@ -1544,7 +1505,6 @@ int LoadGame(const char *pName)
return iRet; return iRet;
} }
/* <3fccf> ../engine/host_cmd.c:2334 */
int Host_Load(const char *pName) int Host_Load(const char *pName)
{ {
FILE *pFile; FILE *pFile;
@ -1615,7 +1575,6 @@ int Host_Load(const char *pName)
return 1; return 1;
} }
/* <3ed7d> ../engine/host_cmd.c:2439 */
SAVERESTOREDATA *SaveGamestate(void) SAVERESTOREDATA *SaveGamestate(void)
{ {
char name[256]; char name[256];
@ -1753,12 +1712,10 @@ SAVERESTOREDATA *SaveGamestate(void)
return pSaveData; return pSaveData;
} }
/* <3d6e8> ../engine/host_cmd.c:2592 */
void CL_Save(const char *name) void CL_Save(const char *name)
{ {
} }
/* <3eb39> ../engine/host_cmd.c:2623 */
void EntityInit(edict_t *pEdict, int className) void EntityInit(edict_t *pEdict, int className)
{ {
ENTITYINIT pEntityInit; ENTITYINIT pEntityInit;
@ -1773,7 +1730,6 @@ void EntityInit(edict_t *pEdict, int className)
pEntityInit(&pEdict->v); pEntityInit(&pEdict->v);
} }
/* <3eb9c> ../engine/host_cmd.c:2640 */
SAVERESTOREDATA *LoadSaveData(const char *level) SAVERESTOREDATA *LoadSaveData(const char *level)
{ {
char name[MAX_PATH]; char name[MAX_PATH];
@ -1859,7 +1815,6 @@ SAVERESTOREDATA *LoadSaveData(const char *level)
return pSaveData; return pSaveData;
} }
/* <3ec7a> ../engine/host_cmd.c:2724 */
void ParseSaveTables(SAVERESTOREDATA *pSaveData, SAVE_HEADER *pHeader, int updateGlobals) void ParseSaveTables(SAVERESTOREDATA *pSaveData, SAVE_HEADER *pHeader, int updateGlobals)
{ {
int i; int i;
@ -1869,7 +1824,7 @@ void ParseSaveTables(SAVERESTOREDATA *pSaveData, SAVE_HEADER *pHeader, int updat
gEntityInterface.pfnSaveReadFields(pSaveData, "ETABLE", &(pSaveData->pTable[i]), gEntityTableDescription, ARRAYSIZE(gEntityTableDescription)); gEntityInterface.pfnSaveReadFields(pSaveData, "ETABLE", &(pSaveData->pTable[i]), gEntityTableDescription, ARRAYSIZE(gEntityTableDescription));
pSaveData->pTable[i].pent = NULL; pSaveData->pTable[i].pent = NULL;
} }
pSaveData->size = 0; pSaveData->size = 0;
pSaveData->pBaseData = pSaveData->pCurrentData; pSaveData->pBaseData = pSaveData->pCurrentData;
gEntityInterface.pfnSaveReadFields(pSaveData, "Save Header", pHeader, gSaveHeaderDescription, ARRAYSIZE(gSaveHeaderDescription)); gEntityInterface.pfnSaveReadFields(pSaveData, "Save Header", pHeader, gSaveHeaderDescription, ARRAYSIZE(gSaveHeaderDescription));
@ -1896,7 +1851,6 @@ void ParseSaveTables(SAVERESTOREDATA *pSaveData, SAVE_HEADER *pHeader, int updat
} }
} }
/* <3ece6> ../engine/host_cmd.c:2770 */
void EntityPatchWrite(SAVERESTOREDATA *pSaveData, const char *level) void EntityPatchWrite(SAVERESTOREDATA *pSaveData, const char *level)
{ {
char name[MAX_PATH]; char name[MAX_PATH];
@ -1924,12 +1878,11 @@ void EntityPatchWrite(SAVERESTOREDATA *pSaveData, const char *level)
FS_Close(pFile); FS_Close(pFile);
} }
/* <3eed5> ../engine/host_cmd.c:2802 */
void EntityPatchRead(SAVERESTOREDATA *pSaveData, const char *level) void EntityPatchRead(SAVERESTOREDATA *pSaveData, const char *level)
{ {
char name[MAX_PATH]; char name[MAX_PATH];
FILE *pFile; FILE *pFile;
int i; int i;
int size; int size;
int entityId; int entityId;
@ -1947,7 +1900,6 @@ void EntityPatchRead(SAVERESTOREDATA *pSaveData, const char *level)
} }
} }
/* <3ef7c> ../engine/host_cmd.c:2826 */
int LoadGamestate(char *level, int createPlayers) int LoadGamestate(char *level, int createPlayers)
{ {
int i; int i;
@ -1974,7 +1926,7 @@ int LoadGamestate(char *level, int createPlayers)
Cvar_SetValue("sv_skyvec_x", header.skyVec_x); Cvar_SetValue("sv_skyvec_x", header.skyVec_x);
Cvar_SetValue("sv_skyvec_y", header.skyVec_y); Cvar_SetValue("sv_skyvec_y", header.skyVec_y);
Cvar_SetValue("sv_skyvec_z", header.skyVec_z); Cvar_SetValue("sv_skyvec_z", header.skyVec_z);
for (i = 0; i < pSaveData->tableCount; i++) for (i = 0; i < pSaveData->tableCount; i++)
{ {
pent = NULL; pent = NULL;
@ -2029,7 +1981,6 @@ int LoadGamestate(char *level, int createPlayers)
return 1; return 1;
} }
/* <3da9b> ../engine/host_cmd.c:2911 */
int EntryInTable(SAVERESTOREDATA *pSaveData, const char *pMapName, int index) int EntryInTable(SAVERESTOREDATA *pSaveData, const char *pMapName, int index)
{ {
int i; int i;
@ -2041,7 +1992,6 @@ int EntryInTable(SAVERESTOREDATA *pSaveData, const char *pMapName, int index)
return -1; return -1;
} }
/* <3f117> ../engine/host_cmd.c:2926 */
void LandmarkOrigin(SAVERESTOREDATA *pSaveData, vec_t *output, const char *pLandmarkName) void LandmarkOrigin(SAVERESTOREDATA *pSaveData, vec_t *output, const char *pLandmarkName)
{ {
int i; int i;
@ -2060,7 +2010,6 @@ void LandmarkOrigin(SAVERESTOREDATA *pSaveData, vec_t *output, const char *pLand
output[2] = 0.0f; output[2] = 0.0f;
} }
/* <3f18c> ../engine/host_cmd.c:2945 */
int EntityInSolid(edict_t *pent) int EntityInSolid(edict_t *pent)
{ {
vec3_t point; vec3_t point;
@ -2077,7 +2026,6 @@ int EntityInSolid(edict_t *pent)
return (SV_PointContents(point) == CONTENTS_SOLID); return (SV_PointContents(point) == CONTENTS_SOLID);
} }
/* <3f1de> ../engine/host_cmd.c:2965 */
int CreateEntityList(SAVERESTOREDATA *pSaveData, int levelMask) int CreateEntityList(SAVERESTOREDATA *pSaveData, int levelMask)
{ {
int i; int i;
@ -2158,7 +2106,6 @@ int CreateEntityList(SAVERESTOREDATA *pSaveData, int levelMask)
return movedCount; return movedCount;
} }
/* <3f2b7> ../engine/host_cmd.c:3047 */
void LoadAdjacentEntities(const char *pOldLevel, const char *pLandmarkName) void LoadAdjacentEntities(const char *pOldLevel, const char *pLandmarkName)
{ {
int i; int i;
@ -2205,7 +2152,7 @@ void LoadAdjacentEntities(const char *pOldLevel, const char *pLandmarkName)
if (!Q_strcmp(currentLevelData.levelList[i].mapName, pOldLevel)) if (!Q_strcmp(currentLevelData.levelList[i].mapName, pOldLevel))
flags |= FENTTABLE_PLAYER; flags |= FENTTABLE_PLAYER;
index = -1; index = -1;
while (1) while (1)
{ {
@ -2227,7 +2174,6 @@ void LoadAdjacentEntities(const char *pOldLevel, const char *pLandmarkName)
gGlobalVariables.pSaveData = NULL; gGlobalVariables.pSaveData = NULL;
} }
/* <3f445> ../engine/host_cmd.c:3111 */
int FileSize(FileHandle_t pFile) int FileSize(FileHandle_t pFile)
{ {
if (!pFile) if (!pFile)
@ -2235,7 +2181,6 @@ int FileSize(FileHandle_t pFile)
return FS_Size(pFile); return FS_Size(pFile);
} }
/* <3f482> ../engine/host_cmd.c:3121 */
void FileCopy(FileHandle_t pOutput, FileHandle_t pInput, int fileSize) void FileCopy(FileHandle_t pOutput, FileHandle_t pInput, int fileSize)
{ {
char buf[1024]; char buf[1024];
@ -2253,7 +2198,6 @@ void FileCopy(FileHandle_t pOutput, FileHandle_t pInput, int fileSize)
} }
} }
/* <3f50f> ../engine/host_cmd.c:3140 */
void DirectoryCopy(const char *pPath, FileHandle_t pFile) void DirectoryCopy(const char *pPath, FileHandle_t pFile)
{ {
const char *findfn; const char *findfn;
@ -2278,7 +2222,6 @@ void DirectoryCopy(const char *pPath, FileHandle_t pFile)
Sys_FindClose(); Sys_FindClose();
} }
/* <3f973> ../engine/host_cmd.c:3167 */
void DirectoryExtract(FileHandle_t pFile, int fileCount) void DirectoryExtract(FileHandle_t pFile, int fileCount)
{ {
int i; int i;
@ -2299,7 +2242,6 @@ void DirectoryExtract(FileHandle_t pFile, int fileCount)
} }
} }
/* <3f627> ../engine/host_cmd.c:3187 */
int DirectoryCount(const char *pPath) int DirectoryCount(const char *pPath)
{ {
int count; int count;
@ -2317,7 +2259,6 @@ int DirectoryCount(const char *pPath)
return count; return count;
} }
/* <3fa97> ../engine/host_cmd.c:3209 */
void Host_ClearSaveDirectory(void) void Host_ClearSaveDirectory(void)
{ {
char szName[MAX_PATH]; char szName[MAX_PATH];
@ -2344,7 +2285,6 @@ void Host_ClearSaveDirectory(void)
Sys_FindClose(); Sys_FindClose();
} }
/* <3fbe0> ../engine/host_cmd.c:3250 */
void Host_ClearGameState(void) void Host_ClearGameState(void)
{ {
S_StopAllSounds(TRUE); S_StopAllSounds(TRUE);
@ -2353,7 +2293,6 @@ void Host_ClearGameState(void)
gEntityInterface.pfnResetGlobalState(); gEntityInterface.pfnResetGlobalState();
} }
/* <3d72c> ../engine/host_cmd.c:3262 */
void Host_Changelevel2_f(void) void Host_Changelevel2_f(void)
{ {
char level[64]; char level[64];
@ -2429,7 +2368,6 @@ void Host_Changelevel2_f(void)
SV_ActivateServer(0); SV_ActivateServer(0);
} }
/* <3db8f> ../engine/host_cmd.c:3369 */
void Host_Version_f(void) void Host_Version_f(void)
{ {
Con_Printf("Protocol version %i\nExe version %s (%s)\n", PROTOCOL_VERSION, gpszVersionString, gpszProductString); Con_Printf("Protocol version %i\nExe version %s (%s)\n", PROTOCOL_VERSION, gpszVersionString, gpszProductString);
@ -2444,7 +2382,6 @@ void Host_Version_f(void)
} }
/* <3d516> ../engine/host_cmd.c:3382 */
void Host_FullInfo_f(void) void Host_FullInfo_f(void)
{ {
char key[512]; char key[512];
@ -2494,13 +2431,11 @@ void Host_FullInfo_f(void)
} }
} }
/* <400a6> ../engine/host_cmd.c:3433 */
NOXREF void Host_KillVoice_f(void) NOXREF void Host_KillVoice_f(void)
{ {
Voice_Deinit(); Voice_Deinit();
} }
/* <3d50b> ../engine/host_cmd.c:3447 */
void Host_SetInfo_f(void) void Host_SetInfo_f(void)
{ {
if (Cmd_Argc() == 1) if (Cmd_Argc() == 1)
@ -2523,7 +2458,6 @@ void Host_SetInfo_f(void)
host_client->sendinfo = TRUE; host_client->sendinfo = TRUE;
} }
/* <3d82c> ../engine/host_cmd.c:3471 */
void Host_Say(qboolean teamonly) void Host_Say(qboolean teamonly)
{ {
client_t *client; client_t *client;
@ -2600,19 +2534,16 @@ void Host_Say(qboolean teamonly)
Log_Printf("Server say \"%s\"\n", p); Log_Printf("Server say \"%s\"\n", p);
} }
/* <3e127> ../engine/host_cmd.c:3541 */
void Host_Say_f(void) void Host_Say_f(void)
{ {
Host_Say(FALSE); Host_Say(FALSE);
} }
/* <3e0d0> ../engine/host_cmd.c:3547 */
void Host_Say_Team_f(void) void Host_Say_Team_f(void)
{ {
Host_Say(TRUE); Host_Say(TRUE);
} }
/* <3d4b1> ../engine/host_cmd.c:3553 */
void Host_Tell_f(void) void Host_Tell_f(void)
{ {
client_t *client; client_t *client;
@ -2673,7 +2604,6 @@ void Host_Tell_f(void)
host_client = save; host_client = save;
} }
/* <3d4a6> ../engine/host_cmd.c:3625 */
void Host_Kill_f(void) void Host_Kill_f(void)
{ {
if (cmd_source == src_command) if (cmd_source == src_command)
@ -2690,7 +2620,6 @@ void Host_Kill_f(void)
gEntityInterface.pfnClientKill(sv_player); gEntityInterface.pfnClientKill(sv_player);
} }
/* <3db79> ../engine/host_cmd.c:3647 */
void Host_TogglePause_f(void) void Host_TogglePause_f(void)
{ {
if (cmd_source == src_command) if (cmd_source == src_command)
@ -2708,12 +2637,11 @@ void Host_TogglePause_f(void)
SV_BroadcastPrintf("%s paused the game\n", &pr_strings[sv_player->v.netname]); SV_BroadcastPrintf("%s paused the game\n", &pr_strings[sv_player->v.netname]);
else else
SV_BroadcastPrintf("%s unpaused the game\n", &pr_strings[sv_player->v.netname]); SV_BroadcastPrintf("%s unpaused the game\n", &pr_strings[sv_player->v.netname]);
MSG_WriteByte(&g_psv.reliable_datagram, svc_setpause); MSG_WriteByte(&g_psv.reliable_datagram, svc_setpause);
MSG_WriteByte(&g_psv.reliable_datagram, g_psv.paused); MSG_WriteByte(&g_psv.reliable_datagram, g_psv.paused);
} }
/* <3d49b> ../engine/host_cmd.c:3679 */
void Host_Pause_f(void) void Host_Pause_f(void)
{ {
// pause only singleplayer when console or main menu opens // pause only singleplayer when console or main menu opens
@ -2732,7 +2660,6 @@ void Host_Pause_f(void)
MSG_WriteByte(&g_psv.reliable_datagram, g_psv.paused); MSG_WriteByte(&g_psv.reliable_datagram, g_psv.paused);
} }
/* <3d490> ../engine/host_cmd.c:3707 */
void Host_Unpause_f(void) void Host_Unpause_f(void)
{ {
// unpause only singleplayer when console or main menu opens // unpause only singleplayer when console or main menu opens
@ -2751,7 +2678,6 @@ void Host_Unpause_f(void)
MSG_WriteByte(&g_psv.reliable_datagram, g_psv.paused); MSG_WriteByte(&g_psv.reliable_datagram, g_psv.paused);
} }
/* <3db08> ../engine/host_cmd.c:3873 */
void Host_Interp_f(void) void Host_Interp_f(void)
{ {
r_dointerp ^= 1; r_dointerp ^= 1;
@ -2761,13 +2687,12 @@ void Host_Interp_f(void)
Con_Printf("Frame Interpolation ON\n"); Con_Printf("Frame Interpolation ON\n");
} }
/* <400f8> ../engine/host_cmd.c:3898 */
void Host_NextDemo(void) void Host_NextDemo(void)
{ {
char str[1024]; char str[1024];
if (g_pcls.demonum == -1) if (g_pcls.demonum == -1)
return; return;
SCR_BeginLoadingPlaque(FALSE); SCR_BeginLoadingPlaque(FALSE);
if (g_pcls.demos[g_pcls.demonum][0]) if (g_pcls.demos[g_pcls.demonum][0])
{ {
@ -2786,7 +2711,6 @@ void Host_NextDemo(void)
g_pcls.demonum = -1; g_pcls.demonum = -1;
} }
/* <3d8c4> ../engine/host_cmd.c:3929 */
void Host_Startdemos_f(void) void Host_Startdemos_f(void)
{ {
int i; int i;
@ -2820,7 +2744,6 @@ void Host_Startdemos_f(void)
} }
} }
/* <3d8b9> ../engine/host_cmd.c:3972 */
void Host_Demos_f(void) void Host_Demos_f(void)
{ {
if (g_pcls.state != ca_dedicated) if (g_pcls.state != ca_dedicated)
@ -2832,7 +2755,6 @@ void Host_Demos_f(void)
} }
} }
/* <3d485> ../engine/host_cmd.c:3989 */
void Host_Stopdemo_f(void) void Host_Stopdemo_f(void)
{ {
if (g_pcls.state != ca_dedicated) if (g_pcls.state != ca_dedicated)
@ -2845,7 +2767,6 @@ void Host_Stopdemo_f(void)
} }
} }
/* <401a6> ../engine/host_cmd.c:4009 */
NOXREF void Host_EndSection(const char *pszSection) NOXREF void Host_EndSection(const char *pszSection)
{ {
giActive = DLL_PAUSED; giActive = DLL_PAUSED;
@ -2868,7 +2789,6 @@ NOXREF void Host_EndSection(const char *pszSection)
Cbuf_AddText("\ndisconnect\n"); Cbuf_AddText("\ndisconnect\n");
} }
/* <3db1e> ../engine/host_cmd.c:4050 */
void Host_Soundfade_f(void) void Host_Soundfade_f(void)
{ {
int percent; int percent;
@ -2916,7 +2836,6 @@ void Host_Soundfade_f(void)
g_pcls.soundfade.soundFadeInTime = inTime; g_pcls.soundfade.soundFadeInTime = inTime;
} }
/* <3daf2> ../engine/host_cmd.c:4095 */
void Host_KillServer_f(void) void Host_KillServer_f(void)
{ {
if (g_pcls.state != ca_dedicated) if (g_pcls.state != ca_dedicated)
@ -2931,7 +2850,6 @@ void Host_KillServer_f(void)
} }
} }
/* <401d0> ../engine/host_cmd.c:4110 */
void Host_VoiceRecordStart_f(void) void Host_VoiceRecordStart_f(void)
{ {
const char *pUncompressedFile = NULL; const char *pUncompressedFile = NULL;
@ -2951,7 +2869,6 @@ void Host_VoiceRecordStart_f(void)
Voice_RecordStart(pUncompressedFile, pDecompressedFile, pInputFile); Voice_RecordStart(pUncompressedFile, pDecompressedFile, pInputFile);
} }
/* <40225> ../engine/host_cmd.c:4136 */
void Host_VoiceRecordStop_f(void) void Host_VoiceRecordStop_f(void)
{ {
if (g_pcls.state != ca_active) if (g_pcls.state != ca_active)
@ -2964,16 +2881,14 @@ void Host_VoiceRecordStop_f(void)
} }
} }
/* <4023b> ../engine/host_cmd.c:4230 */
void Host_Crash_f(void) void Host_Crash_f(void)
{ {
int *p = NULL; int *p = NULL;
*p = 0xffffffff; *p = 0xffffffff;
} }
/* <40260> ../engine/host_cmd.c:4242 */
void Host_InitCommands(void) void Host_InitCommands(void)
{ {
#ifdef HOOK_ENGINE #ifdef HOOK_ENGINE
Cmd_AddCommand("shutdownserver", (xcommand_t)GetOriginalFuncAddrOrDefault("Host_KillServer_f", (void *)Host_KillServer_f)); Cmd_AddCommand("shutdownserver", (xcommand_t)GetOriginalFuncAddrOrDefault("Host_KillServer_f", (void *)Host_KillServer_f));
Cmd_AddCommand("soundfade", (xcommand_t)GetOriginalFuncAddrOrDefault("Host_Soundfade_f", (void *)Host_Soundfade_f)); Cmd_AddCommand("soundfade", (xcommand_t)GetOriginalFuncAddrOrDefault("Host_Soundfade_f", (void *)Host_Soundfade_f));
@ -3092,7 +3007,6 @@ void Host_InitCommands(void)
Cvar_RegisterVariable(&voice_inputfromfile); Cvar_RegisterVariable(&voice_inputfromfile);
} }
/* <40276> ../engine/host_cmd.c:4388 */
void SV_CheckBlendingInterface(void) void SV_CheckBlendingInterface(void)
{ {
int i; int i;
@ -3117,7 +3031,6 @@ void SV_CheckBlendingInterface(void)
} }
} }
/* <3e266> ../engine/host_cmd.c:4431 */
void SV_CheckSaveGameCommentInterface(void) void SV_CheckSaveGameCommentInterface(void)
{ {
int i; int i;

7
rehlds/engine/host_cmd.h
View File

@ -42,10 +42,8 @@
#define FILETIME_TO_PAIR(f,h)\ #define FILETIME_TO_PAIR(f,h)\
(((uint64)f << 32) | h) (((uint64)f << 32) | h)
/* <3d22f> ../engine/host_cmd.c:83 */
typedef void (*SV_SAVEGAMECOMMENT_FUNC)(char *, int); typedef void (*SV_SAVEGAMECOMMENT_FUNC)(char *, int);
/* <3c2b9> ../engine/host_cmd.h:40 */
typedef struct GAME_HEADER_s typedef struct GAME_HEADER_s
{ {
char mapName[32]; char mapName[32];
@ -53,7 +51,6 @@ typedef struct GAME_HEADER_s
int mapCount; int mapCount;
} GAME_HEADER; } GAME_HEADER;
/* <3c307> ../engine/host_cmd.h:47 */
typedef struct SAVE_HEADER_s typedef struct SAVE_HEADER_s
{ {
int saveId; int saveId;
@ -73,14 +70,12 @@ typedef struct SAVE_HEADER_s
float skyVec_z; float skyVec_z;
} SAVE_HEADER; } SAVE_HEADER;
/* <3c3ed> ../engine/host_cmd.h:67 */
typedef struct SAVELIGHTSTYLE_s typedef struct SAVELIGHTSTYLE_s
{ {
int index; int index;
char style[64]; char style[64];
} SAVELIGHTSTYLE; } SAVELIGHTSTYLE;
/* <3d29e> ../engine/host_cmd.c:1792 */
typedef struct TITLECOMMENT_s typedef struct TITLECOMMENT_s
{ {
char *pBSPName; char *pBSPName;
@ -110,7 +105,7 @@ typedef struct TITLECOMMENT_s
#define g_iQuitCommandIssued (*pg_iQuitCommandIssued) #define g_iQuitCommandIssued (*pg_iQuitCommandIssued)
#define g_pPostRestartCmdLineArgs pg_pPostRestartCmdLineArgs #define g_pPostRestartCmdLineArgs pg_pPostRestartCmdLineArgs
#endif //HOOK_ENGINE #endif // HOOK_ENGINE
extern int r_dointerp; extern int r_dointerp;
extern vec3_t r_origin; extern vec3_t r_origin;

142
rehlds/engine/iengine.h
View File

@ -34,7 +34,6 @@
#include "maintypes.h" #include "maintypes.h"
class IEngine class IEngine
{ {
public: public:
@ -45,137 +44,30 @@ public:
QUIT_RESTART QUIT_RESTART
}; };
virtual ~IEngine(void) { } virtual ~IEngine() {}
virtual bool Load(bool dedicated, char *basedir, char *cmdline) = 0; virtual bool Load(bool dedicated, char *basedir, char *cmdline) = 0;
virtual void Unload(void) = 0; virtual void Unload() = 0;
virtual void SetState(int iState) = 0; virtual void SetState(int iState) = 0;
virtual int GetState(void) = 0; virtual int GetState() = 0;
virtual void SetSubState(int iSubState) = 0; virtual void SetSubState(int iSubState) = 0;
virtual int GetSubState(void) = 0; virtual int GetSubState() = 0;
virtual int Frame(void) = 0; virtual int Frame() = 0;
virtual double GetFrameTime(void) = 0; virtual double GetFrameTime() = 0;
virtual double GetCurTime(void) = 0; virtual double GetCurTime() = 0;
virtual void TrapKey_Event(int key, bool down) = 0; virtual void TrapKey_Event(int key, bool down) = 0;
virtual void TrapMouse_Event(int buttons, bool down) = 0; virtual void TrapMouse_Event(int buttons, bool down) = 0;
virtual void StartTrapMode(void) = 0; virtual void StartTrapMode() = 0;
virtual bool IsTrapping(void) = 0; virtual bool IsTrapping() = 0;
virtual bool CheckDoneTrapping(int& buttons, int& key) = 0; virtual bool CheckDoneTrapping(int &buttons, int &key) = 0;
virtual int GetQuitting(void) = 0; virtual int GetQuitting() = 0;
virtual void SetQuitting(int quittype) = 0; virtual void SetQuitting(int quittype) = 0;
}; };
extern IEngine *eng; extern IEngine *eng;
///* <8f12e> ../engine/iengine.h:39 */
//virtual void ~IEngine(class IEngine *, int)
//{
//} /* size: 165463000 */
//
///* <8f151> ../engine/iengine.h:41 */
//virtual bool Load(class IEngine *, bool, char *, char *) /* linkage=_ZN7IEngine4LoadEbPcS0_ */
//{
//} /* size: 1 */
//
///* <8f188> ../engine/iengine.h:42 */
//virtual void Unload(class IEngine *) /* linkage=_ZN7IEngine6UnloadEv */
//{
//} /* size: 0 */
//
///* <8f1ac> ../engine/iengine.h:43 */
//virtual void SetState(class IEngine *, int) /* linkage=_ZN7IEngine8SetStateEi */
//{
//} /* size: 165479164 */
//
///* <8f1d5> ../engine/iengine.h:44 */
//virtual int GetState(class IEngine *) /* linkage=_ZN7IEngine8GetStateEv */
//{
//} /* size: 4 */
//
///* <8f1fd> ../engine/iengine.h:45 */
//virtual void SetSubState(class IEngine *, int) /* linkage=_ZN7IEngine11SetSubStateEi */
//{
//} /* size: 165463956 */
//
///* <8f226> ../engine/iengine.h:46 */
//virtual int GetSubState(class IEngine *) /* linkage=_ZN7IEngine11GetSubStateEv */
//{
//} /* size: 4 */
//
///* <8f24e> ../engine/iengine.h:47 */
//virtual int Frame(class IEngine *) /* linkage=_ZN7IEngine5FrameEv */
//{
//} /* size: 4 */
//
///* <8f276> ../engine/iengine.h:49 */
//virtual double GetFrameTime(class IEngine *) /* linkage=_ZN7IEngine12GetFrameTimeEv */
//{
//} /* size: 8 */
//
///* <8f29e> ../engine/iengine.h:50 */
//virtual double GetCurTime(class IEngine *) /* linkage=_ZN7IEngine10GetCurTimeEv */
//{
//} /* size: 8 */
//
///* <8f2c6> ../engine/iengine.h:52 */
//virtual void TrapKey_Event(class IEngine *, int, bool) /* linkage=_ZN7IEngine13TrapKey_EventEib */
//{
//} /* size: 0 */
//
///* <8f2f4> ../engine/iengine.h:53 */
//virtual void TrapMouse_Event(class IEngine *, int, bool) /* linkage=_ZN7IEngine15TrapMouse_EventEib */
//{
//} /* size: 773 */
//
///* <8f322> ../engine/iengine.h:55 */
//virtual void StartTrapMode(class IEngine *) /* linkage=_ZN7IEngine13StartTrapModeEv */
//{
//} /* size: 2865 */
//
///* <8f346> ../engine/iengine.h:56 */
//virtual bool IsTrapping(class IEngine *) /* linkage=_ZN7IEngine10IsTrappingEv */
//{
//} /* size: 1 */
//
///* <8f36e> ../engine/iengine.h:57 */
//virtual bool CheckDoneTrapping(class IEngine *, int &, int &) /* linkage=_ZN7IEngine17CheckDoneTrappingERiS0_ */
//{
//} /* size: 1 */
//
///* <8f3a0> ../engine/iengine.h:59 */
//virtual int GetQuitting(class IEngine *) /* linkage=_ZN7IEngine11GetQuittingEv */
//{
//} /* size: 4 */
//
///* <8f3c8> ../engine/iengine.h:60 */
//virtual void SetQuitting(class IEngine *, int) /* linkage=_ZN7IEngine11SetQuittingEi */
//{
//} /* size: 165481496 */
//
///* <961fe> ../engine/iengine.h:29 */
//inline void IEngine(class IEngine *const this)
//{
//} /* size: 167122024 */
//
///* <8fcbf> ../engine/iengine.h:39 */
//inline void ~IEngine(class IEngine *const this, intconst __in_chrg)
//{
//} /* size: 768 */
//
///* <96256> ../engine/iengine.h:39 */
//void ~IEngine(class IEngine *const this)
//{
//} /* size: 167122528 */
//
///* <965c9> ../engine/iengine.h:39 */
//void ~IEngine(class IEngine *const this)
//{
// ~IEngine(class IEngine *const this,
// intconst __in_chrg); /* size=167350372, low_pc=0 */ // 39
//} /* size: 167350468 */
#endif // IENGINE_H #endif // IENGINE_H

56
rehlds/engine/igame.h
View File

@ -28,75 +28,25 @@
#pragma once #pragma once
#include "maintypes.h" #include "maintypes.h"
//Restored params names from hl2beta https://github.com/RaisingTheDerp/raisingthebar/
/* <8f8da> ../engine/igame.h:26 */
class IGame { class IGame {
public: public:
/* <8f8f7> ../engine/igame.h:29 */
virtual ~IGame() { } virtual ~IGame() { }
/* <8f91a> ../engine/igame.h:31 */
virtual bool Init(void *pvInstance) = 0; virtual bool Init(void *pvInstance) = 0;
/* <8f947> ../engine/igame.h:32 */
virtual bool Shutdown() = 0; virtual bool Shutdown() = 0;
/* <8f96f> ../engine/igame.h:34 */
virtual bool CreateGameWindow() = 0; virtual bool CreateGameWindow() = 0;
/* <8f997> ../engine/igame.h:36 */
virtual void SleepUntilInput(int time) = 0; virtual void SleepUntilInput(int time) = 0;
/* <8f9c0> ../engine/igame.h:38 */
virtual HWND GetMainWindow() = 0; virtual HWND GetMainWindow() = 0;
virtual HWND *GetMainWindowAddress() = 0;
/* <8f9e8> ../engine/igame.h:39 */
virtual HWND * GetMainWindowAddress() = 0;
/* <8fa10> ../engine/igame.h:41 */
virtual void SetWindowXY(int x, int y) = 0; virtual void SetWindowXY(int x, int y) = 0;
/* <8fa3e> ../engine/igame.h:42 */
virtual void SetWindowSize(int w, int h) = 0; virtual void SetWindowSize(int w, int h) = 0;
/* <8fa6c> ../engine/igame.h:44 */
virtual void GetWindowRect(int *x, int *y, int *w, int *h) = 0; virtual void GetWindowRect(int *x, int *y, int *w, int *h) = 0;
/* <8faa4> ../engine/igame.h:47 */
virtual bool IsActiveApp() = 0; virtual bool IsActiveApp() = 0;
/* <8facc> ../engine/igame.h:49 */
virtual bool IsMultiplayer() = 0; virtual bool IsMultiplayer() = 0;
/* <8faf4> ../engine/igame.h:51 */
virtual void PlayStartupVideos() = 0; virtual void PlayStartupVideos() = 0;
/* <8fb18> ../engine/igame.h:52 */
virtual void PlayAVIAndWait(const char *aviFile) = 0; virtual void PlayAVIAndWait(const char *aviFile) = 0;
virtual void SetCursorVisible(bool bState) = 0;
/* <8fb41> ../engine/igame.h:54 */ };
virtual void SetCursorVisible(bool vis) = 0;
/* vtable has 14 entries: {
[2] = Init(_ZN5IGame4InitEPv),
[3] = Shutdown(_ZN5IGame8ShutdownEv),
[4] = CreateGameWindow(_ZN5IGame16CreateGameWindowEv),
[5] = SleepUntilInput(_ZN5IGame15SleepUntilInputEi),
[6] = GetMainWindow(_ZN5IGame13GetMainWindowEv),
[7] = GetMainWindowAddress(_ZN5IGame20GetMainWindowAddressEv),
[8] = SetWindowXY(_ZN5IGame11SetWindowXYEii),
[9] = SetWindowSize(_ZN5IGame13SetWindowSizeEii),
[10] = GetWindowRect(_ZN5IGame13GetWindowRectEPiS0_S0_S0_),
[11] = IsActiveApp(_ZN5IGame11IsActiveAppEv),
[12] = IsMultiplayer(_ZN5IGame13IsMultiplayerEv),
[13] = PlayStartupVideos(_ZN5IGame17PlayStartupVideosEv),
[14] = PlayAVIAndWait(_ZN5IGame14PlayAVIAndWaitEPKc),
[15] = SetCursorVisible(_ZN5IGame16SetCursorVisibleEb),
} */
/* size: 4, cachelines: 1, members: 1 */
/* last cacheline: 4 bytes */
}; /* size: 4 */

21
rehlds/engine/info.cpp
View File

@ -31,15 +31,8 @@
// NOTE: This file contains a lot of fixes that are not covered by REHLDS_FIXES define. // NOTE: This file contains a lot of fixes that are not covered by REHLDS_FIXES define.
// TODO: Most of the Info_ functions can be speedup via removing unneded copy of key and values. // TODO: Most of the Info_ functions can be speedup via removing unneded copy of key and values.
/* // Searches the string for the given
=============== // key and returns the associated value, or an empty string.
Info_ValueForKey
Searches the string for the given
key and returns the associated value, or an empty string.
===============
*/
/* <40d86> ../engine/info.c:23 */
const char* EXT_FUNC Info_ValueForKey(const char *s, const char *key) const char* EXT_FUNC Info_ValueForKey(const char *s, const char *key)
{ {
// use few (two?) buffers so compares work without stomping on each other // use few (two?) buffers so compares work without stomping on each other
@ -106,7 +99,6 @@ const char* EXT_FUNC Info_ValueForKey(const char *s, const char *key)
return ""; return "";
} }
/* <40e38> ../engine/info.c:72 */
void Info_RemoveKey(char *s, const char *key) void Info_RemoveKey(char *s, const char *key)
{ {
char pkey[MAX_KV_LEN]; char pkey[MAX_KV_LEN];
@ -184,7 +176,6 @@ void Info_RemoveKey(char *s, const char *key)
} }
} }
/* <40ecf> ../engine/info.c:136 */
void Info_RemovePrefixedKeys(char *s, const char prefix) void Info_RemovePrefixedKeys(char *s, const char prefix)
{ {
char pkey[MAX_KV_LEN]; char pkey[MAX_KV_LEN];
@ -250,7 +241,6 @@ void Info_RemovePrefixedKeys(char *s, const char prefix)
} }
} }
/* <40d4a> ../engine/info.c:188 */
qboolean Info_IsKeyImportant(const char *key) qboolean Info_IsKeyImportant(const char *key)
{ {
if (key[0] == '*') if (key[0] == '*')
@ -282,7 +272,6 @@ qboolean Info_IsKeyImportant(const char *key)
return false; return false;
} }
/* <40f88> ../engine/info.c:216 */
char *Info_FindLargestKey(char *s, int maxsize) char *Info_FindLargestKey(char *s, int maxsize)
{ {
static char largest_key[MAX_KV_LEN]; static char largest_key[MAX_KV_LEN];
@ -360,7 +349,6 @@ char *Info_FindLargestKey(char *s, int maxsize)
return largest_key; return largest_key;
} }
/* <41063> ../engine/info.c:275 */
void Info_SetValueForStarKey(char *s, const char *key, const char *value, int maxsize) void Info_SetValueForStarKey(char *s, const char *key, const char *value, int maxsize)
{ {
char newArray[MAX_INFO_STRING]; char newArray[MAX_INFO_STRING];
@ -466,7 +454,6 @@ void Info_SetValueForStarKey(char *s, const char *key, const char *value, int ma
*s = 0; *s = 0;
} }
/* <4113e> ../engine/info.c:361 */
void Info_SetValueForKey(char *s, const char *key, const char *value, int maxsize) void Info_SetValueForKey(char *s, const char *key, const char *value, int maxsize)
{ {
if (key[0] == '*') if (key[0] == '*')
@ -478,7 +465,6 @@ void Info_SetValueForKey(char *s, const char *key, const char *value, int maxsiz
Info_SetValueForStarKey(s, key, value, maxsize); Info_SetValueForStarKey(s, key, value, maxsize);
} }
/* <41193> ../engine/info.c:372 */
void Info_Print(const char *s) void Info_Print(const char *s)
{ {
char key[MAX_KV_LEN]; char key[MAX_KV_LEN];
@ -553,7 +539,6 @@ void Info_Print(const char *s)
} }
} }
/* <4120e> ../engine/info.c:426 */
qboolean Info_IsValid(const char *s) qboolean Info_IsValid(const char *s)
{ {
char key[MAX_KV_LEN]; char key[MAX_KV_LEN];
@ -665,4 +650,4 @@ void Info_CollectFields(char *destInfo, const char *srcInfo, const char *collect
} }
destInfo[userInfoLength] = '\0'; destInfo[userInfoLength] = '\0';
} }
#endif #endif // REHLDS_FIXES

1
rehlds/engine/inst_baseline.h
View File

@ -36,7 +36,6 @@
#define NUM_BASELINES 64 #define NUM_BASELINES 64
/* <7469c> ../engine/inst_baseline.h:9 */
typedef struct extra_baselines_s typedef struct extra_baselines_s
{ {
int number; int number;

6
rehlds/engine/ipratelimit.cpp
View File

@ -30,13 +30,11 @@
//bool (__fastcall *pCIPRateLimit__CheckIP)(CIPRateLimit *obj, int none, netadr_t adr); //bool (__fastcall *pCIPRateLimit__CheckIP)(CIPRateLimit *obj, int none, netadr_t adr);
NOBODY bool CIPRateLimit::CheckIP(netadr_t adr)
/* <e50a3> ../engine/ipratelimit.cpp:27 */
bool CIPRateLimit::CheckIP(netadr_t adr)
{ {
// TODO: Reverse me // TODO: Reverse me
//{ //{
// long int curTime; // 29 // long curTime; // 29
// ip_t clientIP; // 32 // ip_t clientIP; // 32
// class iprate_s findEntry; // 56 // class iprate_s findEntry; // 56
// ip_t entry; // 57 // ip_t entry; // 57

37
rehlds/engine/ipratelimit.h
View File

@ -36,23 +36,15 @@
#include "net.h" #include "net.h"
#include "utlrbtree.h" #include "utlrbtree.h"
/* <e009b> ../engine/ipratelimit.h:5 */
class CIPRateLimit class CIPRateLimit
{ {
public: public:
/* <e014f> ../engine/ipratelimit.h:8 */ CIPRateLimit() {}
CIPRateLimit() { } ~CIPRateLimit() {}
/* <e0167> ../engine/ipratelimit.h:9 */ bool CheckIP(netadr_t adr);
~CIPRateLimit() { }
/* <e0185> ../engine/ipratelimit.h:12 */
bool CheckIP(netadr_t adr); /* linkage=_ZN12CIPRateLimit7CheckIPE8netadr_s */
private: private:
/* <e00a7> ../engine/ipratelimit.h:15 */
enum enum
{ {
MAX_TREE_SIZE = 512, MAX_TREE_SIZE = 512,
@ -60,27 +52,22 @@ private:
FLUSH_TIMEOUT = 120, FLUSH_TIMEOUT = 120,
}; };
/* <e00c6> ../engine/ipratelimit.h:18 */
typedef struct iprate_s typedef struct iprate_s
{ {
/* <e00d3> ../engine/ipratelimit.h:17 */
typedef int ip_t; typedef int ip_t;
ip_t ip;
ip_t ip;/* 0 4 */ long lastTime;
long int lastTime;/* 4 4 */ int count;
int count;/* 8 4 */ } iprate_t;
} iprate_t;/* size: 12 */
private: private:
class CUtlRBTree<CIPRateLimit::iprate_s, int> m_IPTree;
int m_iGlobalCount;
long m_lLastTime;
class CUtlRBTree<CIPRateLimit::iprate_s, int> m_IPTree;/* 0 32 */ bool LessIP(const struct iprate_s &, const struct iprate_s &);
int m_iGlobalCount;/* 32 4 */ };
long int m_lLastTime;/* 36 4 */
/* <e01aa> ../engine/ipratelimit.h:25 */
bool LessIP(const struct iprate_s &, const struct iprate_s &); /* linkage=_ZN12CIPRateLimit6LessIPERKNS_8iprate_sES2_ */
};/* size: 40 */
//extern bool (__fastcall *pCIPRateLimit__CheckIP)(CIPRateLimit *obj, int none, netadr_t adr); //extern bool (__fastcall *pCIPRateLimit__CheckIP)(CIPRateLimit *obj, int none, netadr_t adr);

5
rehlds/engine/ipratelimitWrapper.cpp
View File

@ -28,15 +28,12 @@
#include "precompiled.h" #include "precompiled.h"
#ifdef HOOK_ENGINE #ifdef HOOK_ENGINE
int (*pCheckIP)(netadr_t adr); int (*pCheckIP)(netadr_t adr);
#endif //HOOK_ENGINE #endif // HOOK_ENGINE
class CIPRateLimit rateChecker; class CIPRateLimit rateChecker;
/* <e7175> ../engine/ipratelimitWrapper.cpp:6 */
int CheckIP(netadr_t adr) int CheckIP(netadr_t adr)
{ {
#ifdef HOOK_ENGINE #ifdef HOOK_ENGINE

2
rehlds/engine/keys.h
View File

@ -4,4 +4,4 @@ typedef enum {
key_game = 0, key_game = 0,
key_message = 1, key_message = 1,
key_menu = 2, key_menu = 2,
} keydest_t; /* size: 4 */ } keydest_t;

2
rehlds/engine/l_studio.cpp
View File

@ -30,8 +30,6 @@
//int giTextureSize; //int giTextureSize;
/* <42900> ../engine/l_studio.c:31 */
void EXT_FUNC Mod_LoadStudioModel_internal(model_t * mod, void * buffer) void EXT_FUNC Mod_LoadStudioModel_internal(model_t * mod, void * buffer)
{ {
uint8 *poutdata; uint8 *poutdata;

31
rehlds/engine/mathlib.cpp
View File

@ -109,13 +109,11 @@ inline __m128 length2D(__m128 v)
return _mm_sqrt_ps(_mm_hadd_ps(v, v)); // hadd = SSE3 return _mm_sqrt_ps(_mm_hadd_ps(v, v)); // hadd = SSE3
} }
/* <46ebf> ../engine/mathlib.c:14 */
float anglemod(float a) float anglemod(float a)
{ {
return (360.0 / 65536) * ((int)(a*(65536 / 360.0)) & 65535); return (360.0 / 65536) * ((int)(a*(65536 / 360.0)) & 65535);
} }
/* <46eea> ../engine/mathlib.c:33 */
void BOPS_Error(void) void BOPS_Error(void)
{ {
Sys_Error("BoxOnPlaneSide: Bad signbits"); Sys_Error("BoxOnPlaneSide: Bad signbits");
@ -195,7 +193,7 @@ int BoxOnPlaneSide(vec_t *emins, vec_t *emaxs, mplane_t *p)
return sides; return sides;
} }
#else #else
/* <46f05> ../engine/mathlib.c:48 */
int BoxOnPlaneSide(vec_t *emins, vec_t *emaxs, mplane_t *p) int BoxOnPlaneSide(vec_t *emins, vec_t *emaxs, mplane_t *p)
{ {
#if (1) #if (1)
@ -257,7 +255,6 @@ int BoxOnPlaneSide(vec_t *emins, vec_t *emaxs, mplane_t *p)
} }
#endif #endif
/* <46f8d> ../engine/mathlib.c:157 */
NOBODY int InvertMatrix(const float *m, float *out); NOBODY int InvertMatrix(const float *m, float *out);
//{ //{
// float wtmp; // 159 // float wtmp; // 159
@ -323,7 +320,6 @@ void AngleVectors(const vec_t *angles, vec_t *forward, vec_t *right, vec_t *up)
} }
} }
#else // REHLDS_FIXES #else // REHLDS_FIXES
/* <47067> ../engine/mathlib.c:267 */
void AngleVectors(const vec_t *angles, vec_t *forward, vec_t *right, vec_t *up) void AngleVectors(const vec_t *angles, vec_t *forward, vec_t *right, vec_t *up)
{ {
float sr, sp, sy, cr, cp, cy; float sr, sp, sy, cr, cp, cy;
@ -408,7 +404,6 @@ void AngleVectorsTranspose(const vec_t *angles, vec_t *forward, vec_t *right, ve
} }
} }
#else // REHLDS_FIXES #else // REHLDS_FIXES
/* <4712e> ../engine/mathlib.c:304 */
void AngleVectorsTranspose(const vec_t *angles, vec_t *forward, vec_t *right, vec_t *up) void AngleVectorsTranspose(const vec_t *angles, vec_t *forward, vec_t *right, vec_t *up)
{ {
float sr, sp, sy, cr, cp, cy; float sr, sp, sy, cr, cp, cy;
@ -503,7 +498,6 @@ void AngleMatrix(const vec_t *angles, float(*matrix)[4])
*(int *)&matrix[2][3] = 0; *(int *)&matrix[2][3] = 0;
} }
#else // REHLDS_FIXES #else // REHLDS_FIXES
/* <471e9> ../engine/mathlib.c:340 */
void AngleMatrix(const vec_t *angles, float(*matrix)[4]) void AngleMatrix(const vec_t *angles, float(*matrix)[4])
{ {
float sr, sp, sy, cr, cp, cy; float sr, sp, sy, cr, cp, cy;
@ -536,7 +530,6 @@ void AngleMatrix(const vec_t *angles, float(*matrix)[4])
} }
#endif // REHLDS_FIXES #endif // REHLDS_FIXES
/* <4729e> ../engine/mathlib.c:370 */
NOBODY void AngleIMatrix(const vec_t *angles, float *matrix); NOBODY void AngleIMatrix(const vec_t *angles, float *matrix);
//{ //{
// float angle; // 372 // float angle; // 372
@ -548,13 +541,11 @@ NOBODY void AngleIMatrix(const vec_t *angles, float *matrix);
// float cy; // 373 // float cy; // 373
//} //}
/* <4733d> ../engine/mathlib.c:400 */
NOBODY void NormalizeAngles(float *angles); NOBODY void NormalizeAngles(float *angles);
//{ //{
// int i; // 402 // int i; // 402
//} //}
/* <47389> ../engine/mathlib.c:426 */
NOBODY void InterpolateAngles(float *start, float *end, float *output, float frac); NOBODY void InterpolateAngles(float *start, float *end, float *output, float frac);
//{ //{
// int i; // 428 // int i; // 428
@ -566,7 +557,6 @@ NOBODY void InterpolateAngles(float *start, float *end, float *output, float fra
// NormalizeAngles(float *angles); /* size=0, low_pc=0 */ // 453 // NormalizeAngles(float *angles); /* size=0, low_pc=0 */ // 453
//} //}
/* <47495> ../engine/mathlib.c:457 */
void VectorTransform(const vec_t *in1, float *in2, vec_t *out) void VectorTransform(const vec_t *in1, float *in2, vec_t *out)
{ {
out[0] = _DotProduct(in1, in2 + 0) + in2[3]; out[0] = _DotProduct(in1, in2 + 0) + in2[3];
@ -574,7 +564,6 @@ void VectorTransform(const vec_t *in1, float *in2, vec_t *out)
out[2] = _DotProduct(in1, in2 + 8) + in2[11]; out[2] = _DotProduct(in1, in2 + 8) + in2[11];
} }
/* <474dc> ../engine/mathlib.c:465 */
int VectorCompare(const vec_t *v1, const vec_t *v2) int VectorCompare(const vec_t *v1, const vec_t *v2)
{ {
#ifdef REHLDS_OPT_PEDANTIC #ifdef REHLDS_OPT_PEDANTIC
@ -596,7 +585,6 @@ void VectorMA(const vec_t *veca, float scale, const vec_t *vecm, vec_t *out)
xmm2vec(out, _mm_add_ps(_mm_mul_ps(_mm_set_ps1(scale), _mm_loadu_ps(vecm)), _mm_loadu_ps(veca))); xmm2vec(out, _mm_add_ps(_mm_mul_ps(_mm_set_ps1(scale), _mm_loadu_ps(vecm)), _mm_loadu_ps(veca)));
} }
#else #else
/* <47524> ../engine/mathlib.c:476 */
void VectorMA(const vec_t *veca, float scale, const vec_t *vecm, vec_t *out) void VectorMA(const vec_t *veca, float scale, const vec_t *vecm, vec_t *out)
{ {
out[0] = scale * vecm[0] + veca[0]; out[0] = scale * vecm[0] + veca[0];
@ -606,7 +594,6 @@ void VectorMA(const vec_t *veca, float scale, const vec_t *vecm, vec_t *out)
#endif #endif
#ifndef REHLDS_FIXES #ifndef REHLDS_FIXES
/* <4757a> ../engine/mathlib.c:484 */
long double _DotProduct(const vec_t *v1, const vec_t *v2) long double _DotProduct(const vec_t *v1, const vec_t *v2)
{ {
return v1[0] * v2[0] + v1[1] * v2[1] + v1[2] * v2[2]; return v1[0] * v2[0] + v1[1] * v2[1] + v1[2] * v2[2];
@ -624,12 +611,10 @@ float _DotProduct(const vec_t *v1, const vec_t *v2)
} }
#endif // REHLDS_FIXES #endif // REHLDS_FIXES
/* <475b4> ../engine/mathlib.c:489 */
NOBODY void _VectorSubtract(vec_t *veca, vec_t *vecb, vec_t *out); NOBODY void _VectorSubtract(vec_t *veca, vec_t *vecb, vec_t *out);
//{ //{
//} //}
/* <475fb> ../engine/mathlib.c:496 */
void _VectorAdd(vec_t *veca, vec_t *vecb, vec_t *out) void _VectorAdd(vec_t *veca, vec_t *vecb, vec_t *out)
{ {
out[0] = veca[0] + vecb[0]; out[0] = veca[0] + vecb[0];
@ -637,12 +622,10 @@ void _VectorAdd(vec_t *veca, vec_t *vecb, vec_t *out)
out[2] = veca[2] + vecb[2]; out[2] = veca[2] + vecb[2];
} }
/* <47642> ../engine/mathlib.c:503 */
NOBODY void _VectorCopy(vec_t *in, vec_t *out); NOBODY void _VectorCopy(vec_t *in, vec_t *out);
//{ //{
//} //}
/* <47679> ../engine/mathlib.c:510 */
void CrossProduct(const vec_t *v1, const vec_t *v2, vec_t *cross) void CrossProduct(const vec_t *v1, const vec_t *v2, vec_t *cross)
{ {
#ifdef REHLDS_FIXES #ifdef REHLDS_FIXES
@ -654,7 +637,6 @@ void CrossProduct(const vec_t *v1, const vec_t *v2, vec_t *cross)
#endif // REHLDS_FIXES #endif // REHLDS_FIXES
} }
/* <476d8> ../engine/mathlib.c:519 */
float Length(const vec_t *v) float Length(const vec_t *v)
{ {
#ifdef REHLDS_FIXES #ifdef REHLDS_FIXES
@ -680,7 +662,6 @@ float Length2D(const vec_t *v)
return Q_sqrt(v[0] * v[0] + v[1] * v[1]); return Q_sqrt(v[0] * v[0] + v[1] * v[1]);
} }
/* <47722> ../engine/mathlib.c:532 */
float VectorNormalize(vec3_t v) float VectorNormalize(vec3_t v)
{ {
float length, ilength; float length, ilength;
@ -703,12 +684,10 @@ float VectorNormalize(vec3_t v)
return length; return length;
} }
/* <47788> ../engine/mathlib.c:551 */
NOBODY void VectorInverse(vec_t *v); NOBODY void VectorInverse(vec_t *v);
//{ //{
//} //}
/* <477af> ../engine/mathlib.c:558 */
void VectorScale(const vec_t *in, float scale, vec_t *out) void VectorScale(const vec_t *in, float scale, vec_t *out)
{ {
out[0] = scale * in[0]; out[0] = scale * in[0];
@ -716,13 +695,11 @@ void VectorScale(const vec_t *in, float scale, vec_t *out)
out[2] = scale * in[2]; out[2] = scale * in[2];
} }
/* <477f5> ../engine/mathlib.c:566 */
NOBODY int Q_log2(int val); NOBODY int Q_log2(int val);
//{ //{
// int answer; // 568 // int answer; // 568
//} //}
/* <47833> ../engine/mathlib.c:574 */
NOBODY void VectorMatrix(vec_t *forward, vec_t *right, vec_t *up); NOBODY void VectorMatrix(vec_t *forward, vec_t *right, vec_t *up);
//{ //{
// vec3_t tmp; // 576 // vec3_t tmp; // 576
@ -736,7 +713,6 @@ NOBODY void VectorMatrix(vec_t *forward, vec_t *right, vec_t *up);
// VectorNormalize(vec_t *v); /* size=0, low_pc=0 */ // 593 // VectorNormalize(vec_t *v); /* size=0, low_pc=0 */ // 593
//} //}
/* <4794e> ../engine/mathlib.c:597 */
void VectorAngles(const vec_t *forward, vec_t *angles) void VectorAngles(const vec_t *forward, vec_t *angles)
{ {
float length, yaw, pitch; float length, yaw, pitch;
@ -771,13 +747,11 @@ void VectorAngles(const vec_t *forward, vec_t *angles)
angles[2] = 0; angles[2] = 0;
} }
/* <479b7> ../engine/mathlib.c:632 */
NOBODY void R_ConcatRotations(float *in1, float *in2, float *out); NOBODY void R_ConcatRotations(float *in1, float *in2, float *out);
//{ //{
// //
//} //}
/* <47a04> ../engine/mathlib.c:660 */
#ifdef REHLDS_FIXES #ifdef REHLDS_FIXES
void R_ConcatTransforms(float in1[3][4], float in2[3][4], float out[3][4]) void R_ConcatTransforms(float in1[3][4], float in2[3][4], float out[3][4])
{ {
@ -808,7 +782,6 @@ void R_ConcatTransforms(float in1[3][4], float in2[3][4], float out[3][4])
} }
#endif // REHLDS_FIXES #endif // REHLDS_FIXES
/* <47a4b> ../engine/mathlib.c:699 */
NOBODY void FloorDivMod(double numer, double denom, int *quotient, int *rem); NOBODY void FloorDivMod(double numer, double denom, int *quotient, int *rem);
//{ //{
// int q; // 702 // int q; // 702
@ -818,12 +791,10 @@ NOBODY void FloorDivMod(double numer, double denom, int *quotient, int *rem);
// floor(double __x); /* size=0, low_pc=0 */ // 717 // floor(double __x); /* size=0, low_pc=0 */ // 717
//} //}
/* <47b4c> ../engine/mathlib.c:746 */
NOBODY int GreatestCommonDivisor(int i1, int i2); NOBODY int GreatestCommonDivisor(int i1, int i2);
//{ //{
//} //}
/* <47b87> ../engine/mathlib.c:775 */
NOBODY fixed16_t Invert24To16(fixed16_t val); NOBODY fixed16_t Invert24To16(fixed16_t val);
//{ //{
//} //}

7
rehlds/engine/mem.cpp
View File

@ -28,14 +28,11 @@
#include "precompiled.h" #include "precompiled.h"
/* <47cf1> ../engine/mem.c:8 */
void *Mem_Malloc(size_t size) void *Mem_Malloc(size_t size)
{ {
return malloc(size); return malloc(size);
} }
/* <47d1c> ../engine/mem.c:13 */
void *Mem_ZeroMalloc(size_t size) void *Mem_ZeroMalloc(size_t size)
{ {
void *p = malloc(size); void *p = malloc(size);
@ -43,25 +40,21 @@ void *Mem_ZeroMalloc(size_t size)
return p; return p;
} }
/* <47d55> ../engine/mem.c:23 */
void *Mem_Realloc(void *memblock, size_t size) void *Mem_Realloc(void *memblock, size_t size)
{ {
return realloc(memblock, size); return realloc(memblock, size);
} }
/* <47d8e> ../engine/mem.c:28 */
void* EXT_FUNC Mem_Calloc(int num, size_t size) void* EXT_FUNC Mem_Calloc(int num, size_t size)
{ {
return calloc(num, size); return calloc(num, size);
} }
/* <47dc7> ../engine/mem.c:33 */
char *Mem_Strdup(const char *strSource) char *Mem_Strdup(const char *strSource)
{ {
return _strdup(strSource); return _strdup(strSource);
} }
/* <47df2> ../engine/mem.c:38 */
void Mem_Free(void *p) void Mem_Free(void *p)
{ {
free(p); free(p);

53
rehlds/engine/model.cpp
View File

@ -44,8 +44,6 @@ mod_known_info_t mod_known_info[MAX_KNOWN_MODELS];
#define NL_NEEDS_LOADED 1 #define NL_NEEDS_LOADED 1
#define NL_UNREFERENCED 2 #define NL_UNREFERENCED 2
/* <51468> ../engine/model.c:147 */
void SW_Mod_Init(void) void SW_Mod_Init(void)
{ {
#ifndef SWDS #ifndef SWDS
@ -53,7 +51,6 @@ void SW_Mod_Init(void)
#endif #endif
} }
/* <52f8d> ../engine/model.c:164 */
void* EXT_FUNC Mod_Extradata(model_t *mod) void* EXT_FUNC Mod_Extradata(model_t *mod)
{ {
void *r; void *r;
@ -84,7 +81,6 @@ void* EXT_FUNC Mod_Extradata(model_t *mod)
return mod->cache.data; return mod->cache.data;
} }
/* <5147c> ../engine/model.c:190 */
mleaf_t *Mod_PointInLeaf(vec_t *p, model_t *model) mleaf_t *Mod_PointInLeaf(vec_t *p, model_t *model)
{ {
mnode_t *node; // 192 mnode_t *node; // 192
@ -111,7 +107,6 @@ mleaf_t *Mod_PointInLeaf(vec_t *p, model_t *model)
return (mleaf_t *)node; return (mleaf_t *)node;
} }
/* <514e5> ../engine/model.c:226 */
void Mod_ClearAll(void) void Mod_ClearAll(void)
{ {
int i; int i;
@ -127,7 +122,6 @@ void Mod_ClearAll(void)
} }
} }
/* <5151a> ../engine/model.c:248 */
void Mod_FillInCRCInfo(qboolean trackCRC, int model_number) void Mod_FillInCRCInfo(qboolean trackCRC, int model_number)
{ {
mod_known_info_t *p; mod_known_info_t *p;
@ -138,7 +132,6 @@ void Mod_FillInCRCInfo(qboolean trackCRC, int model_number)
p->initialCRC = 0; p->initialCRC = 0;
} }
/* <51546> ../engine/model.c:264 */
model_t *Mod_FindName(qboolean trackCRC, const char *name) model_t *Mod_FindName(qboolean trackCRC, const char *name)
{ {
model_t *avail; model_t *avail;
@ -185,7 +178,6 @@ model_t *Mod_FindName(qboolean trackCRC, const char *name)
return mod; return mod;
} }
/* <51615> ../engine/model.c:329 */
NOXREF qboolean Mod_ValidateCRC(const char *name, CRC32_t crc) NOXREF qboolean Mod_ValidateCRC(const char *name, CRC32_t crc)
{ {
model_t *mod; model_t *mod;
@ -202,7 +194,6 @@ NOXREF qboolean Mod_ValidateCRC(const char *name, CRC32_t crc)
return TRUE; return TRUE;
} }
/* <5166e> ../engine/model.c:362 */
NOXREF void Mod_NeedCRC(const char *name, qboolean needCRC) NOXREF void Mod_NeedCRC(const char *name, qboolean needCRC)
{ {
model_t *mod; model_t *mod;
@ -254,7 +245,6 @@ qboolean IsCZPlayerModel(uint32 crc, const char * filename)
return 0; return 0;
} }
/* <513ce> ../engine/model.c:394 */
model_t *Mod_LoadModel(model_t *mod, qboolean crash, qboolean trackCRC) model_t *Mod_LoadModel(model_t *mod, qboolean crash, qboolean trackCRC)
{ {
unsigned char *buf; unsigned char *buf;
@ -318,7 +308,7 @@ model_t *Mod_LoadModel(model_t *mod, qboolean crash, qboolean trackCRC)
p->firstCRCDone = 1; p->firstCRCDone = 1;
p->initialCRC = currentCRC; p->initialCRC = currentCRC;
SetCStrikeFlags(); SetCStrikeFlags();
if (!IsGameSubscribed("czero") && g_bIsCStrike && IsCZPlayerModel(currentCRC, mod->name) && g_pcls.state) if (!IsGameSubscribed("czero") && g_bIsCStrike && IsCZPlayerModel(currentCRC, mod->name) && g_pcls.state)
{ {
COM_ExplainDisconnection(TRUE, "Cannot continue with altered model %s, disconnecting.", mod->name); COM_ExplainDisconnection(TRUE, "Cannot continue with altered model %s, disconnecting.", mod->name);
@ -360,13 +350,11 @@ model_t *Mod_LoadModel(model_t *mod, qboolean crash, qboolean trackCRC)
return mod; return mod;
} }
/* <516c5> ../engine/model.c:540 */
NOXREF void Mod_MarkClient(model_t *pModel) NOXREF void Mod_MarkClient(model_t *pModel)
{ {
pModel->needload = (NL_NEEDS_LOADED | NL_UNREFERENCED); pModel->needload = (NL_NEEDS_LOADED | NL_UNREFERENCED);
} }
/* <52edc> ../engine/model.c:552 */
model_t *Mod_ForName(const char *name, qboolean crash, qboolean trackCRC) model_t *Mod_ForName(const char *name, qboolean crash, qboolean trackCRC)
{ {
model_t *mod; model_t *mod;
@ -378,7 +366,6 @@ model_t *Mod_ForName(const char *name, qboolean crash, qboolean trackCRC)
return Mod_LoadModel(mod, crash, trackCRC); return Mod_LoadModel(mod, crash, trackCRC);
} }
/* <516ee> ../engine/model.c:589 */
void Mod_AdInit(void) void Mod_AdInit(void)
{ {
int i; int i;
@ -410,7 +397,6 @@ void Mod_AdInit(void)
} }
} }
/* <51751> ../engine/model.c:621 */
void Mod_AdSwap(texture_t *src, int pixels, int entries) void Mod_AdSwap(texture_t *src, int pixels, int entries)
{ {
// int j; // 623 // int j; // 623
@ -420,7 +406,6 @@ void Mod_AdSwap(texture_t *src, int pixels, int entries)
Sys_Error(__FUNCTION__ ": Reverse me"); Sys_Error(__FUNCTION__ ": Reverse me");
} }
/* <51803> ../engine/model.c:656 */
void Mod_LoadTextures(lump_t *l) void Mod_LoadTextures(lump_t *l)
{ {
dmiptexlump_t *m; dmiptexlump_t *m;
@ -454,7 +439,7 @@ void Mod_LoadTextures(lump_t *l)
m->_nummiptex = LittleLong(m->_nummiptex); m->_nummiptex = LittleLong(m->_nummiptex);
loadmodel->numtextures = m->_nummiptex; loadmodel->numtextures = m->_nummiptex;
loadmodel->textures = (texture_t **)Hunk_AllocName(4 * loadmodel->numtextures, loadname); loadmodel->textures = (texture_t **)Hunk_AllocName(4 * loadmodel->numtextures, loadname);
for (int i = 0; i < m->_nummiptex; i++) for (int i = 0; i < m->_nummiptex; i++)
{ {
m->dataofs[i] = LittleLong(m->dataofs[i]); m->dataofs[i] = LittleLong(m->dataofs[i]);
@ -629,7 +614,6 @@ void Mod_LoadTextures(lump_t *l)
Con_DPrintf("Texture load: %6.1fms\n", (Sys_FloatTime() - starttime) * 1000.0); Con_DPrintf("Texture load: %6.1fms\n", (Sys_FloatTime() - starttime) * 1000.0);
} }
/* <51386> ../engine/model.c:878 */
void Mod_LoadLighting(lump_t *l) void Mod_LoadLighting(lump_t *l)
{ {
if (l->filelen) if (l->filelen)
@ -643,7 +627,6 @@ void Mod_LoadLighting(lump_t *l)
} }
} }
/* <519f8> ../engine/model.c:895 */
void Mod_LoadVisibility(lump_t *l) void Mod_LoadVisibility(lump_t *l)
{ {
if (!l->filelen) if (!l->filelen)
@ -655,7 +638,6 @@ void Mod_LoadVisibility(lump_t *l)
Q_memcpy(loadmodel->visdata, mod_base + l->fileofs, l->filelen); Q_memcpy(loadmodel->visdata, mod_base + l->fileofs, l->filelen);
} }
/* <513a6> ../engine/model.c:913 */
void Mod_LoadEntities(lump_t *l) void Mod_LoadEntities(lump_t *l)
{ {
if (!l->filelen) if (!l->filelen)
@ -690,7 +672,6 @@ void Mod_LoadEntities(lump_t *l)
} }
/* <51a67> ../engine/model.c:950 */
void Mod_LoadVertexes(lump_t *l) void Mod_LoadVertexes(lump_t *l)
{ {
dvertex_t *in; dvertex_t *in;
@ -714,7 +695,6 @@ void Mod_LoadVertexes(lump_t *l)
} }
} }
/* <51ad2> ../engine/model.c:978 */
void Mod_LoadSubmodels(lump_t *l) void Mod_LoadSubmodels(lump_t *l)
{ {
dmodel_t *in; dmodel_t *in;
@ -746,7 +726,6 @@ void Mod_LoadSubmodels(lump_t *l)
} }
} }
/* <51b45> ../engine/model.c:1014 */
void Mod_LoadEdges(lump_t *l) void Mod_LoadEdges(lump_t *l)
{ {
dedge_t *in; dedge_t *in;
@ -769,7 +748,6 @@ void Mod_LoadEdges(lump_t *l)
} }
} }
/* <51bb0> ../engine/model.c:1041 */
void Mod_LoadTexinfo(lump_t *l) void Mod_LoadTexinfo(lump_t *l)
{ {
texinfo_t *in; texinfo_t *in;
@ -836,7 +814,6 @@ void Mod_LoadTexinfo(lump_t *l)
} }
} }
/* <51c59> ../engine/model.c:1109 */
void CalcSurfaceExtents(msurface_t *s) void CalcSurfaceExtents(msurface_t *s)
{ {
float mins[2], maxs[2], val; float mins[2], maxs[2], val;
@ -883,7 +860,6 @@ void CalcSurfaceExtents(msurface_t *s)
} }
} }
/* <51d09> ../engine/model.c:1161 */
void Mod_LoadFaces(lump_t *l) void Mod_LoadFaces(lump_t *l)
{ {
dface_t *in; dface_t *in;
@ -966,7 +942,6 @@ void Mod_LoadFaces(lump_t *l)
} }
} }
/* <51dcc> ../engine/model.c:1262 */
void Mod_SetParent(mnode_t *node, mnode_t *parent) void Mod_SetParent(mnode_t *node, mnode_t *parent)
{ {
node->parent = parent; node->parent = parent;
@ -976,7 +951,6 @@ void Mod_SetParent(mnode_t *node, mnode_t *parent)
Mod_SetParent(node->children[1], node); Mod_SetParent(node->children[1], node);
} }
/* <51f0a> ../engine/model.c:1276 */
void Mod_LoadNodes(lump_t *l) void Mod_LoadNodes(lump_t *l)
{ {
int i, j, count, p; int i, j, count, p;
@ -1019,7 +993,6 @@ void Mod_LoadNodes(lump_t *l)
Mod_SetParent(loadmodel->nodes, NULL); // sets nodes and leafs Mod_SetParent(loadmodel->nodes, NULL); // sets nodes and leafs
} }
/* <51f91> ../engine/model.c:1324 */
void Mod_LoadLeafs(lump_t *l) void Mod_LoadLeafs(lump_t *l)
{ {
dleaf_t *in; dleaf_t *in;
@ -1062,7 +1035,6 @@ void Mod_LoadLeafs(lump_t *l)
} }
} }
/* <52018> ../engine/model.c:1373 */
void Mod_LoadClipnodes(lump_t *l) void Mod_LoadClipnodes(lump_t *l)
{ {
dclipnode_t *in, *out; dclipnode_t *in, *out;
@ -1122,7 +1094,6 @@ void Mod_LoadClipnodes(lump_t *l)
} }
} }
/* <52093> ../engine/model.c:1439 */
void Mod_MakeHull0(void) void Mod_MakeHull0(void)
{ {
mnode_t *in, *child; mnode_t *in, *child;
@ -1155,7 +1126,6 @@ void Mod_MakeHull0(void)
} }
} }
/* <52119> ../engine/model.c:1476 */
void Mod_LoadMarksurfaces(lump_t *l) void Mod_LoadMarksurfaces(lump_t *l)
{ {
int i, j, count; int i, j, count;
@ -1180,7 +1150,6 @@ void Mod_LoadMarksurfaces(lump_t *l)
} }
} }
/* <5218c> ../engine/model.c:1505 */
void Mod_LoadSurfedges(lump_t *l) void Mod_LoadSurfedges(lump_t *l)
{ {
int i, count; int i, count;
@ -1199,7 +1168,6 @@ void Mod_LoadSurfedges(lump_t *l)
out[i] = LittleLong(in[i]); out[i] = LittleLong(in[i]);
} }
/* <52215> ../engine/model.c:1528 */
void Mod_LoadPlanes(lump_t *l) void Mod_LoadPlanes(lump_t *l)
{ {
int i, j; int i, j;
@ -1233,7 +1201,6 @@ void Mod_LoadPlanes(lump_t *l)
} }
} }
/* <5229e> ../engine/model.c:1566 */
float RadiusFromBounds(vec_t *mins, vec_t *maxs) float RadiusFromBounds(vec_t *mins, vec_t *maxs)
{ {
int i; int i;
@ -1247,12 +1214,11 @@ float RadiusFromBounds(vec_t *mins, vec_t *maxs)
return Length(corner); return Length(corner);
} }
void Mod_LoadBrushModel(model_t *mod, void *buffer) void Mod_LoadBrushModel(model_t *mod, void *buffer)
{ {
g_RehldsHookchains.m_Mod_LoadBrushModel.callChain(&Mod_LoadBrushModel_internal, mod, buffer); g_RehldsHookchains.m_Mod_LoadBrushModel.callChain(&Mod_LoadBrushModel_internal, mod, buffer);
} }
/* <52314> ../engine/model.c:1584 */
void EXT_FUNC Mod_LoadBrushModel_internal(model_t *mod, void *buffer) void EXT_FUNC Mod_LoadBrushModel_internal(model_t *mod, void *buffer)
{ {
dmodel_t *bm; dmodel_t *bm;
@ -1323,7 +1289,7 @@ void EXT_FUNC Mod_LoadBrushModel_internal(model_t *mod, void *buffer)
mod->radius = RadiusFromBounds(mod->mins, mod->maxs); mod->radius = RadiusFromBounds(mod->mins, mod->maxs);
mod->numleafs = bm->visleafs; mod->numleafs = bm->visleafs;
if (i < mod->numsubmodels - 1) if (i < mod->numsubmodels - 1)
{ {
Q_snprintf(name, 10, "*%i", i + 1); Q_snprintf(name, 10, "*%i", i + 1);
@ -1337,7 +1303,6 @@ void EXT_FUNC Mod_LoadBrushModel_internal(model_t *mod, void *buffer)
} }
} }
/* <5255d> ../engine/model.c:1695 */
NOXREF void *Mod_LoadAliasFrame(void *pin, int *pframeindex, int numv, trivertx_t *pbboxmin, trivertx_t *pbboxmax, aliashdr_t *pheader, char *name) NOXREF void *Mod_LoadAliasFrame(void *pin, int *pframeindex, int numv, trivertx_t *pbboxmin, trivertx_t *pbboxmax, aliashdr_t *pheader, char *name)
{ {
trivertx_t *pframe; trivertx_t *pframe;
@ -1371,7 +1336,6 @@ NOXREF void *Mod_LoadAliasFrame(void *pin, int *pframeindex, int numv, trivertx_
return (void *)&pinframe[numv]; return (void *)&pinframe[numv];
} }
/* <52656> ../engine/model.c:1743 */
NOXREF void *Mod_LoadAliasGroup(void *pin, int *pframeindex, int numv, trivertx_t *pbboxmin, trivertx_t *pbboxmax, aliashdr_t *pheader, char *name) NOXREF void *Mod_LoadAliasGroup(void *pin, int *pframeindex, int numv, trivertx_t *pbboxmin, trivertx_t *pbboxmax, aliashdr_t *pheader, char *name)
{ {
daliasgroup_t *pingroup; daliasgroup_t *pingroup;
@ -1418,7 +1382,6 @@ NOXREF void *Mod_LoadAliasGroup(void *pin, int *pframeindex, int numv, trivertx_
return ptemp; return ptemp;
} }
/* <5275d> ../engine/model.c:1808 */
NOXREF void *Mod_LoadAliasSkin(void *pin, int *pskinindex, int skinsize, aliashdr_t *pheader) NOXREF void *Mod_LoadAliasSkin(void *pin, int *pskinindex, int skinsize, aliashdr_t *pheader)
{ {
unsigned char *pskin; unsigned char *pskin;
@ -1438,7 +1401,6 @@ NOXREF void *Mod_LoadAliasSkin(void *pin, int *pskinindex, int skinsize, aliashd
return (void *)&pinskin[skinsize]; return (void *)&pinskin[skinsize];
} }
/* <52812> ../engine/model.c:1844 */
NOXREF void *Mod_LoadAliasSkinGroup(void *pin, int *pskinindex, int skinsize, aliashdr_t *pheader) NOXREF void *Mod_LoadAliasSkinGroup(void *pin, int *pskinindex, int skinsize, aliashdr_t *pheader)
{ {
daliasskingroup_t *pinskingroup; daliasskingroup_t *pinskingroup;
@ -1478,7 +1440,6 @@ NOXREF void *Mod_LoadAliasSkinGroup(void *pin, int *pskinindex, int skinsize, al
return ptemp; return ptemp;
} }
/* <52936> ../engine/model.c:1900 */
NOXREF void Mod_LoadAliasModel(model_t *mod, void *buffer) NOXREF void Mod_LoadAliasModel(model_t *mod, void *buffer)
{ {
int i; int i;
@ -1654,7 +1615,6 @@ NOXREF void Mod_LoadAliasModel(model_t *mod, void *buffer)
} }
} }
/* <52b76> ../engine/model.c:2150 */
void *Mod_LoadSpriteFrame(void *pin, mspriteframe_t **ppframe) void *Mod_LoadSpriteFrame(void *pin, mspriteframe_t **ppframe)
{ {
dspriteframe_t *pinframe; dspriteframe_t *pinframe;
@ -1708,7 +1668,6 @@ void *Mod_LoadSpriteFrame(void *pin, mspriteframe_t **ppframe)
return (void *)((byte *)pinframe + sizeof(dspriteframe_t) + size); return (void *)((byte *)pinframe + sizeof(dspriteframe_t) + size);
} }
/* <52c36> ../engine/model.c:2204 */
void *Mod_LoadSpriteGroup(void *pin, mspriteframe_t **ppframe) void *Mod_LoadSpriteGroup(void *pin, mspriteframe_t **ppframe)
{ {
dspritegroup_t *pingroup; dspritegroup_t *pingroup;
@ -1753,7 +1712,6 @@ void *Mod_LoadSpriteGroup(void *pin, mspriteframe_t **ppframe)
return ptemp; return ptemp;
} }
/* <52cf2> ../engine/model.c:2256 */
void Mod_LoadSpriteModel(model_t *mod, void *buffer) void Mod_LoadSpriteModel(model_t *mod, void *buffer)
{ {
int i; int i;
@ -1837,7 +1795,6 @@ void Mod_LoadSpriteModel(model_t *mod, void *buffer)
mod->type = mod_sprite; mod->type = mod_sprite;
} }
/* <5300a> ../engine/model.c:2360 */
NOXREF void Mod_UnloadSpriteTextures(model_t *pModel) NOXREF void Mod_UnloadSpriteTextures(model_t *pModel)
{ {
if (!pModel) if (!pModel)
@ -1861,7 +1818,6 @@ NOXREF void Mod_UnloadSpriteTextures(model_t *pModel)
} }
} }
/* <53033> ../engine/model.c:2376 */
void Mod_Print(void) void Mod_Print(void)
{ {
int i; int i;
@ -1878,7 +1834,6 @@ void Mod_Print(void)
} }
} }
/* <5306c> ../engine/model.c:2399 */
NOXREF void Mod_ChangeGame(void) NOXREF void Mod_ChangeGame(void)
{ {
int i; int i;

4
rehlds/engine/modinfo.h
View File

@ -34,8 +34,6 @@
#include "maintypes.h" #include "maintypes.h"
/* <8eef1> ../engine/modinfo.h:7 */
typedef enum typedef enum
{ {
BOTH = 0, BOTH = 0,
@ -43,7 +41,6 @@ typedef enum
MULTIPLAYER_ONLY, MULTIPLAYER_ONLY,
} MOD_GAMEPLAY_TYPE_E; } MOD_GAMEPLAY_TYPE_E;
/* <8ef1b> ../engine/modinfo.h:10 */
typedef struct modinfo_s typedef struct modinfo_s
{ {
qboolean bIsMod; qboolean bIsMod;
@ -60,5 +57,4 @@ typedef struct modinfo_s
int clientDllCRC; int clientDllCRC;
} modinfo_t; } modinfo_t;
#endif // MODINFO_H #endif // MODINFO_H

26
rehlds/engine/net.h
View File

@ -139,15 +139,15 @@
typedef enum svc_commands_e typedef enum svc_commands_e
{ {
svc_bad, //0 svc_bad,
svc_nop, //1 svc_nop,
svc_disconnect, //2 svc_disconnect,
svc_event, //3 svc_event,
svc_version, //4 svc_version,
svc_setview, //5 svc_setview,
svc_sound, //6 svc_sound,
svc_time, //7 svc_time,
svc_print, //8 svc_print,
svc_stufftext, svc_stufftext,
svc_setangle, svc_setangle,
svc_serverinfo, svc_serverinfo,
@ -219,13 +219,11 @@ typedef enum clc_commands_e
clc_endoflist = 255, clc_endoflist = 255,
} clc_commands_t; } clc_commands_t;
#define MAX_FLOWS 2 #define MAX_FLOWS 2
#define FLOW_OUTGOING 0 #define FLOW_OUTGOING 0
#define FLOW_INCOMING 1 #define FLOW_INCOMING 1
/* <e41> ../engine/net.h:91 */
// Message data // Message data
typedef struct flowstats_s typedef struct flowstats_s
{ {
@ -237,7 +235,6 @@ typedef struct flowstats_s
#define MAX_LATENT 32 #define MAX_LATENT 32
/* <e71> ../engine/net.h:101 */
typedef struct flow_s typedef struct flow_s
{ {
// Data for last MAX_LATENT messages // Data for last MAX_LATENT messages
@ -283,7 +280,6 @@ typedef struct flow_s
#define FRAG_GETID(fragid) ( ( fragid >> 16 ) & 0xffff ) #define FRAG_GETID(fragid) ( ( fragid >> 16 ) & 0xffff )
#define FRAG_GETCOUNT(fragid) ( fragid & 0xffff ) #define FRAG_GETCOUNT(fragid) ( fragid & 0xffff )
/* <ee0> ../engine/net.h:124 */
// Generic fragment structure // Generic fragment structure
typedef struct fragbuf_s typedef struct fragbuf_s
{ {
@ -308,7 +304,6 @@ typedef struct fragbuf_s
int size; int size;
} fragbuf_t; } fragbuf_t;
/* <fb3> ../engine/net.h:149 */
// Waiting list of fragbuf chains // Waiting list of fragbuf chains
typedef struct fragbufwaiting_s typedef struct fragbufwaiting_s
{ {
@ -320,7 +315,6 @@ typedef struct fragbufwaiting_s
fragbuf_t *fragbufs; fragbuf_t *fragbufs;
} fragbufwaiting_t; } fragbufwaiting_t;
/* <1001> ../engine/net.h:160 */
// Network Connection Channel // Network Connection Channel
typedef struct netchan_s typedef struct netchan_s
{ {
@ -344,7 +338,7 @@ typedef struct netchan_s
// Sequencing variables // Sequencing variables
// //
// Increasing count of sequence numbers // Increasing count of sequence numbers
int incoming_sequence; int incoming_sequence;
// # of last outgoing message that has been ack'd. // # of last outgoing message that has been ack'd.
int incoming_acknowledged; int incoming_acknowledged;

42
rehlds/engine/net_chan.cpp
View File

@ -58,7 +58,6 @@ cvar_t sv_filetransfermaxsize;
#endif //HOOK_ENGINE #endif //HOOK_ENGINE
/* <6565b> ../engine/net_chan.c:103 */
void Netchan_UnlinkFragment(fragbuf_t *buf, fragbuf_t **list) void Netchan_UnlinkFragment(fragbuf_t *buf, fragbuf_t **list)
{ {
fragbuf_t *search; fragbuf_t *search;
@ -91,7 +90,6 @@ void Netchan_UnlinkFragment(fragbuf_t *buf, fragbuf_t **list)
Con_Printf(__FUNCTION__ ": Couldn't find fragment\n"); Con_Printf(__FUNCTION__ ": Couldn't find fragment\n");
} }
/* <656b9> ../engine/net_chan.c:148 */
void Netchan_OutOfBand(netsrc_t sock, netadr_t adr, int length, byte *data) void Netchan_OutOfBand(netsrc_t sock, netadr_t adr, int length, byte *data)
{ {
sizebuf_t send; sizebuf_t send;
@ -112,7 +110,6 @@ void Netchan_OutOfBand(netsrc_t sock, netadr_t adr, int length, byte *data)
} }
} }
/* <65700> ../engine/net_chan.c:177 */
void Netchan_OutOfBandPrint(netsrc_t sock, netadr_t adr, char *format, ...) void Netchan_OutOfBandPrint(netsrc_t sock, netadr_t adr, char *format, ...)
{ {
va_list argptr; va_list argptr;
@ -126,7 +123,6 @@ void Netchan_OutOfBandPrint(netsrc_t sock, netadr_t adr, char *format, ...)
Netchan_OutOfBand(sock, adr, len + 1, (byte *)string); Netchan_OutOfBand(sock, adr, len + 1, (byte *)string);
} }
/* <65776> ../engine/net_chan.c:196 */
void Netchan_ClearFragbufs(fragbuf_t **ppbuf) void Netchan_ClearFragbufs(fragbuf_t **ppbuf)
{ {
fragbuf_t *buf, *n; fragbuf_t *buf, *n;
@ -147,7 +143,6 @@ void Netchan_ClearFragbufs(fragbuf_t **ppbuf)
*ppbuf = nullptr; *ppbuf = nullptr;
} }
/* <65810> ../engine/net_chan.c:220 */
void Netchan_ClearFragments(netchan_t *chan) void Netchan_ClearFragments(netchan_t *chan)
{ {
fragbufwaiting_t *wait, *next; fragbufwaiting_t *wait, *next;
@ -168,7 +163,6 @@ void Netchan_ClearFragments(netchan_t *chan)
} }
} }
/* <6590d> ../engine/net_chan.c:250 */
void Netchan_Clear(netchan_t *chan) void Netchan_Clear(netchan_t *chan)
{ {
Netchan_ClearFragments(chan); Netchan_ClearFragments(chan);
@ -200,7 +194,6 @@ void Netchan_Clear(netchan_t *chan)
chan->tempbuffersize = 0; chan->tempbuffersize = 0;
} }
/* <65957> ../engine/net_chan.c:295 */
void Netchan_Setup(netsrc_t socketnumber, netchan_t *chan, netadr_t adr, int player_slot, void *connection_status, qboolean(*pfnNetchan_Blocksize)(void *)) void Netchan_Setup(netsrc_t socketnumber, netchan_t *chan, netadr_t adr, int player_slot, void *connection_status, qboolean(*pfnNetchan_Blocksize)(void *))
{ {
Netchan_Clear(chan); Netchan_Clear(chan);
@ -240,7 +233,6 @@ void Netchan_Setup(netsrc_t socketnumber, netchan_t *chan, netadr_t adr, int pla
chan->pfnNetchan_Blocksize = pfnNetchan_Blocksize; chan->pfnNetchan_Blocksize = pfnNetchan_Blocksize;
} }
/* <65a0a> ../engine/net_chan.c:327 */
qboolean Netchan_CanPacket(netchan_t *chan) qboolean Netchan_CanPacket(netchan_t *chan)
{ {
// Never choke loopback packets. // Never choke loopback packets.
@ -253,7 +245,6 @@ qboolean Netchan_CanPacket(netchan_t *chan)
return chan->cleartime < realtime ? TRUE : FALSE; return chan->cleartime < realtime ? TRUE : FALSE;
} }
/* <65a37> ../engine/net_chan.c:350 */
void Netchan_UpdateFlow(netchan_t *chan) void Netchan_UpdateFlow(netchan_t *chan)
{ {
if (!chan) if (!chan)
@ -284,7 +275,6 @@ void Netchan_UpdateFlow(netchan_t *chan)
} }
} }
/* <65b51> ../engine/net_chan.c:412 */
void Netchan_Transmit(netchan_t *chan, int length, byte *data) void Netchan_Transmit(netchan_t *chan, int length, byte *data)
{ {
byte send_buf[NET_MAX_MESSAGE]; byte send_buf[NET_MAX_MESSAGE];
@ -344,7 +334,7 @@ void Netchan_Transmit(netchan_t *chan, int length, byte *data)
} }
#endif #endif
// If we have data in the waiting list(s) and we have cleared the current queue(s), then // If we have data in the waiting list(s) and we have cleared the current queue(s), then
// push the waitlist(s) into the current queue(s) // push the waitlist(s) into the current queue(s)
Netchan_FragSend(chan); Netchan_FragSend(chan);
@ -585,7 +575,6 @@ void Netchan_Transmit(netchan_t *chan, int length, byte *data)
} }
} }
/* <65449> ../engine/net_chan.c:730 */
fragbuf_t *Netchan_FindBufferById(fragbuf_t **pplist, int id, qboolean allocate) fragbuf_t *Netchan_FindBufferById(fragbuf_t **pplist, int id, qboolean allocate)
{ {
fragbuf_t *list = *pplist; fragbuf_t *list = *pplist;
@ -610,7 +599,6 @@ fragbuf_t *Netchan_FindBufferById(fragbuf_t **pplist, int id, qboolean allocate)
return pnewbuf; return pnewbuf;
} }
/* <65e8c> ../engine/net_chan.c:767 */
void Netchan_CheckForCompletion(netchan_t *chan, int stream, int intotalbuffers) void Netchan_CheckForCompletion(netchan_t *chan, int stream, int intotalbuffers)
{ {
int c; int c;
@ -654,7 +642,6 @@ void Netchan_CheckForCompletion(netchan_t *chan, int stream, int intotalbuffers)
} }
} }
/* <65f1e> ../engine/net_chan.c:826 */
qboolean Netchan_Validate(netchan_t *chan, qboolean *frag_message, unsigned int *fragid, int *frag_offset, int *frag_length) qboolean Netchan_Validate(netchan_t *chan, qboolean *frag_message, unsigned int *fragid, int *frag_offset, int *frag_length)
{ {
for (int i = 0; i < MAX_STREAMS; i++) for (int i = 0; i < MAX_STREAMS; i++)
@ -703,7 +690,6 @@ qboolean Netchan_Validate(netchan_t *chan, qboolean *frag_message, unsigned int
return TRUE; return TRUE;
} }
/* <65fe9> ../engine/net_chan.c:872 */
qboolean Netchan_Process(netchan_t *chan) qboolean Netchan_Process(netchan_t *chan)
{ {
// int i; // 874 // int i; // 874
@ -759,7 +745,7 @@ qboolean Netchan_Process(netchan_t *chan)
chan->last_received = realtime; chan->last_received = realtime;
// get sequence numbers // get sequence numbers
MSG_BeginReading(); MSG_BeginReading();
sequence = MSG_ReadLong(); sequence = MSG_ReadLong();
sequence_ack = MSG_ReadLong(); sequence_ack = MSG_ReadLong();
@ -855,7 +841,7 @@ qboolean Netchan_Process(netchan_t *chan)
} }
// //
// if this message contains a reliable message, bump incoming_reliable_sequence // if this message contains a reliable message, bump incoming_reliable_sequence
// //
chan->incoming_sequence = sequence; chan->incoming_sequence = sequence;
chan->incoming_acknowledged = sequence_ack; chan->incoming_acknowledged = sequence_ack;
@ -904,7 +890,7 @@ qboolean Netchan_Process(netchan_t *chan)
// Rearrange incoming data to not have the frag stuff in the middle of it // Rearrange incoming data to not have the frag stuff in the middle of it
int wpos = msg_readcount + frag_offset[i]; int wpos = msg_readcount + frag_offset[i];
int rpos = wpos + frag_length[i]; int rpos = wpos + frag_length[i];
Q_memmove(net_message.data + wpos, net_message.data + rpos, net_message.cursize - rpos); Q_memmove(net_message.data + wpos, net_message.data + rpos, net_message.cursize - rpos);
net_message.cursize -= frag_length[i]; net_message.cursize -= frag_length[i];
@ -922,7 +908,6 @@ qboolean Netchan_Process(netchan_t *chan)
return TRUE; return TRUE;
} }
/* <65aeb> ../engine/net_chan.c:1123 */
void Netchan_FragSend(netchan_t *chan) void Netchan_FragSend(netchan_t *chan)
{ {
fragbufwaiting_t *wait; fragbufwaiting_t *wait;
@ -991,7 +976,6 @@ void Netchan_FragSend(netchan_t *chan)
} }
} }
/* <66273> ../engine/net_chan.c:1165 */
void Netchan_AddBufferToList(fragbuf_t **pplist, fragbuf_t *pbuf) void Netchan_AddBufferToList(fragbuf_t **pplist, fragbuf_t *pbuf)
{ {
// Find best slot // Find best slot
@ -1032,7 +1016,6 @@ void Netchan_AddBufferToList(fragbuf_t **pplist, fragbuf_t *pbuf)
pprev->next = pbuf; pprev->next = pbuf;
} }
/* <6554c> ../engine/net_chan.c:1211 */
fragbuf_t *Netchan_AllocFragbuf(void) fragbuf_t *Netchan_AllocFragbuf(void)
{ {
fragbuf_t *buf; fragbuf_t *buf;
@ -1048,7 +1031,6 @@ fragbuf_t *Netchan_AllocFragbuf(void)
return buf; return buf;
} }
/* <65302> ../engine/net_chan.c:1234 */
void Netchan_AddFragbufToTail(fragbufwaiting_t *wait, fragbuf_t *buf) void Netchan_AddFragbufToTail(fragbufwaiting_t *wait, fragbuf_t *buf)
{ {
fragbuf_t *p; fragbuf_t *p;
@ -1071,7 +1053,6 @@ void Netchan_AddFragbufToTail(fragbufwaiting_t *wait, fragbuf_t *buf)
} }
} }
/* <6556c> ../engine/net_chan.c:1261 */
void Netchan_CreateFragments_(qboolean server, netchan_t *chan, sizebuf_t *msg) void Netchan_CreateFragments_(qboolean server, netchan_t *chan, sizebuf_t *msg)
{ {
fragbuf_t *buf; fragbuf_t *buf;
@ -1145,7 +1126,6 @@ void Netchan_CreateFragments_(qboolean server, netchan_t *chan, sizebuf_t *msg)
} }
} }
/* <6635e> ../engine/net_chan.c:1353 */
void Netchan_CreateFragments(qboolean server, netchan_t *chan, sizebuf_t *msg) void Netchan_CreateFragments(qboolean server, netchan_t *chan, sizebuf_t *msg)
{ {
// Always queue any pending reliable data ahead of the fragmentation buffer // Always queue any pending reliable data ahead of the fragmentation buffer
@ -1158,7 +1138,6 @@ void Netchan_CreateFragments(qboolean server, netchan_t *chan, sizebuf_t *msg)
Netchan_CreateFragments_(server, chan, msg); Netchan_CreateFragments_(server, chan, msg);
} }
/* <663e4> ../engine/net_chan.c:1371 */
void Netchan_CreateFileFragmentsFromBuffer(qboolean server, netchan_t *chan, const char *filename, unsigned char *uncompressed_pbuf, int uncompressed_size) void Netchan_CreateFileFragmentsFromBuffer(qboolean server, netchan_t *chan, const char *filename, unsigned char *uncompressed_pbuf, int uncompressed_size)
{ {
int chunksize; int chunksize;
@ -1264,7 +1243,6 @@ void Netchan_CreateFileFragmentsFromBuffer(qboolean server, netchan_t *chan, con
#endif #endif
} }
/* <66564> ../engine/net_chan.c:1500 */
int Netchan_CreateFileFragments(qboolean server, netchan_t *chan, const char *filename) int Netchan_CreateFileFragments(qboolean server, netchan_t *chan, const char *filename)
#ifdef REHLDS_FIXES #ifdef REHLDS_FIXES
{ {
@ -1458,7 +1436,6 @@ int Netchan_CreateFileFragments_(qboolean server, netchan_t *chan, const char *f
return 1; return 1;
} }
/* <6674e> ../engine/net_chan.c:1699 */
void Netchan_FlushIncoming(netchan_t *chan, int stream) void Netchan_FlushIncoming(netchan_t *chan, int stream)
{ {
fragbuf_t *p, *n; fragbuf_t *p, *n;
@ -1478,7 +1455,6 @@ void Netchan_FlushIncoming(netchan_t *chan, int stream)
chan->incomingready[stream] = FALSE; chan->incomingready[stream] = FALSE;
} }
/* <66786> ../engine/net_chan.c:1723 */
qboolean Netchan_CopyNormalFragments(netchan_t *chan) qboolean Netchan_CopyNormalFragments(netchan_t *chan)
{ {
fragbuf_t *p, *n; fragbuf_t *p, *n;
@ -1555,7 +1531,6 @@ qboolean Netchan_CopyNormalFragments(netchan_t *chan)
return TRUE; return TRUE;
} }
/* <667f7> ../engine/net_chan.c:1789 */
qboolean Netchan_CopyFileFragments(netchan_t *chan) qboolean Netchan_CopyFileFragments(netchan_t *chan)
{ {
fragbuf_t *p; fragbuf_t *p;
@ -1757,7 +1732,6 @@ qboolean Netchan_CopyFileFragments(netchan_t *chan)
return TRUE; return TRUE;
} }
/* <66ac6> ../engine/net_chan.c:2009 */
NOXREF qboolean Netchan_IsSending(netchan_t *chan) NOXREF qboolean Netchan_IsSending(netchan_t *chan)
{ {
int i; int i;
@ -1769,7 +1743,6 @@ NOXREF qboolean Netchan_IsSending(netchan_t *chan)
return FALSE; return FALSE;
} }
/* <66b01> ../engine/net_chan.c:2028 */
NOXREF qboolean Netchan_IsReceiving(netchan_t *chan) NOXREF qboolean Netchan_IsReceiving(netchan_t *chan)
{ {
int i; int i;
@ -1781,7 +1754,6 @@ NOXREF qboolean Netchan_IsReceiving(netchan_t *chan)
return FALSE; return FALSE;
} }
/* <66b3c> ../engine/net_chan.c:2047 */
qboolean Netchan_IncomingReady(netchan_t *chan) qboolean Netchan_IncomingReady(netchan_t *chan)
{ {
for (int i = 0; i < MAX_STREAMS; i++) for (int i = 0; i < MAX_STREAMS; i++)
@ -1792,7 +1764,6 @@ qboolean Netchan_IncomingReady(netchan_t *chan)
return FALSE; return FALSE;
} }
/* <66b77> ../engine/net_chan.c:2067 */
NOXREF void Netchan_UpdateProgress(netchan_t *chan) NOXREF void Netchan_UpdateProgress(netchan_t *chan)
{ {
fragbuf_t *p; fragbuf_t *p;
@ -1834,7 +1805,7 @@ NOXREF void Netchan_UpdateProgress(netchan_t *chan)
bestpercent = percent; bestpercent = percent;
} }
p = chan->incomingbufs[i]; p = chan->incomingbufs[i];
if (i == FRAG_FILE_STREAM) if (i == FRAG_FILE_STREAM)
{ {
in = (char *)p->frag_message.data; in = (char *)p->frag_message.data;
out = sz; out = sz;
@ -1870,7 +1841,6 @@ NOXREF void Netchan_UpdateProgress(netchan_t *chan)
scr_downloading.value = bestpercent; scr_downloading.value = bestpercent;
} }
/* <66c7c> ../engine/net_chan.c:2170 */
void Netchan_Init(void) void Netchan_Init(void)
{ {
Cvar_RegisterVariable(&net_log); Cvar_RegisterVariable(&net_log);
@ -1882,13 +1852,11 @@ void Netchan_Init(void)
Cvar_RegisterVariable(&sv_filetransfermaxsize); Cvar_RegisterVariable(&sv_filetransfermaxsize);
} }
/* <65409> ../engine/net_chan.c:2186 */
NOXREF qboolean Netchan_CompressPacket(sizebuf_t *chan) NOXREF qboolean Netchan_CompressPacket(sizebuf_t *chan)
{ {
return FALSE; return FALSE;
} }
/* <65429> ../engine/net_chan.c:2211 */
NOXREF qboolean Netchan_DecompressPacket(sizebuf_t *chan) NOXREF qboolean Netchan_DecompressPacket(sizebuf_t *chan)
{ {
return FALSE; return FALSE;

246
rehlds/engine/net_ws.cpp
View File

@ -104,7 +104,7 @@ cvar_t net_graphwidth = { "net_graphwidth", "150", 0, 0.0f, NULL };
cvar_t net_scale = { "net_scale", "5", FCVAR_ARCHIVE, 0.0f, NULL }; cvar_t net_scale = { "net_scale", "5", FCVAR_ARCHIVE, 0.0f, NULL };
cvar_t net_graphpos = { "net_graphpos", "1", FCVAR_ARCHIVE, 0.0f, NULL }; cvar_t net_graphpos = { "net_graphpos", "1", FCVAR_ARCHIVE, 0.0f, NULL };
#else //HOOK_ENGINE #else // HOOK_ENGINE
cvar_t net_address; cvar_t net_address;
cvar_t ipname; cvar_t ipname;
@ -122,7 +122,7 @@ cvar_t multicastport;
#ifdef _WIN32 #ifdef _WIN32
cvar_t ipx_hostport; cvar_t ipx_hostport;
cvar_t ipx_clientport; cvar_t ipx_clientport;
#endif //_WIN32 #endif // _WIN32
cvar_t fakelag; cvar_t fakelag;
cvar_t fakeloss; cvar_t fakeloss;
@ -131,9 +131,8 @@ cvar_t net_graphwidth;
cvar_t net_scale; cvar_t net_scale;
cvar_t net_graphpos; cvar_t net_graphpos;
#endif //HOOK_ENGINE #endif // HOOK_ENGINE
/* <d3162> ../engine/net_ws.c:167 */
void NET_ThreadLock(void) void NET_ThreadLock(void)
{ {
#ifdef _WIN32 #ifdef _WIN32
@ -144,7 +143,6 @@ void NET_ThreadLock(void)
#endif // _WIN32 #endif // _WIN32
} }
/* <d2c43> ../engine/net_ws.c:177 */
void NET_ThreadUnlock(void) void NET_ThreadUnlock(void)
{ {
#ifdef _WIN32 #ifdef _WIN32
@ -155,13 +153,11 @@ void NET_ThreadUnlock(void)
#endif // _WIN32 #endif // _WIN32
} }
/* <d3182> ../engine/net_ws.c:187 */ unsigned short Q_ntohs(unsigned short netshort)
short unsigned int Q_ntohs(short unsigned int netshort)
{ {
return ntohs(netshort); return ntohs(netshort);
} }
/* <d31f4> ../engine/net_ws.c:194 */
void NetadrToSockadr(const netadr_t *a, struct sockaddr *s) void NetadrToSockadr(const netadr_t *a, struct sockaddr *s)
{ {
Q_memset(s, 0, sizeof(*s)); Q_memset(s, 0, sizeof(*s));
@ -196,7 +192,6 @@ void NetadrToSockadr(const netadr_t *a, struct sockaddr *s)
} }
} }
/* <d321a> ../engine/net_ws.c:228 */
void SockadrToNetadr(const struct sockaddr *s, netadr_t *a) void SockadrToNetadr(const struct sockaddr *s, netadr_t *a)
{ {
if (s->sa_family == AF_INET) if (s->sa_family == AF_INET)
@ -215,15 +210,13 @@ void SockadrToNetadr(const struct sockaddr *s, netadr_t *a)
#endif // _WIN32 #endif // _WIN32
} }
/* <d325f> ../engine/net_ws.c:247 */ NOXREF unsigned short NET_HostToNetShort(unsigned short us_in)
NOXREF short unsigned int NET_HostToNetShort(short unsigned int us_in)
{ {
NOXREFCHECK; NOXREFCHECK;
return htons(us_in); return htons(us_in);
} }
/* <d32b0> ../engine/net_ws.c:252 */
qboolean NET_CompareAdr(netadr_t& a, netadr_t& b) qboolean NET_CompareAdr(netadr_t& a, netadr_t& b)
{ {
if (a.type != b.type) if (a.type != b.type)
@ -256,7 +249,6 @@ qboolean NET_CompareAdr(netadr_t& a, netadr_t& b)
return FALSE; return FALSE;
} }
/* <d32e9> ../engine/net_ws.c:277 */
qboolean NET_CompareClassBAdr(netadr_t& a, netadr_t& b) qboolean NET_CompareClassBAdr(netadr_t& a, netadr_t& b)
{ {
if (a.type != b.type) if (a.type != b.type)
@ -284,7 +276,6 @@ qboolean NET_CompareClassBAdr(netadr_t& a, netadr_t& b)
return FALSE; return FALSE;
} }
/* <d3325> ../engine/net_ws.c:302 */
qboolean NET_IsReservedAdr(netadr_t& a) qboolean NET_IsReservedAdr(netadr_t& a)
{ {
if (a.type == NA_LOOPBACK) if (a.type == NA_LOOPBACK)
@ -321,7 +312,6 @@ qboolean NET_IsReservedAdr(netadr_t& a)
return FALSE; return FALSE;
} }
/* <d3352> ../engine/net_ws.c:332 */
qboolean NET_CompareBaseAdr(const netadr_t& a, const netadr_t& b) qboolean NET_CompareBaseAdr(const netadr_t& a, const netadr_t& b)
{ {
if (a.type != b.type) if (a.type != b.type)
@ -352,7 +342,6 @@ qboolean NET_CompareBaseAdr(const netadr_t& a, const netadr_t& b)
return FALSE; return FALSE;
} }
/* <d2bd7> ../engine/net_ws.c:357 */
char *NET_AdrToString(const netadr_t& a) char *NET_AdrToString(const netadr_t& a)
{ {
static char s[64]; static char s[64];
@ -371,7 +360,6 @@ char *NET_AdrToString(const netadr_t& a)
return s; return s;
} }
/* <d3406> ../engine/net_ws.c:375 */
char *NET_BaseAdrToString(netadr_t& a) char *NET_BaseAdrToString(netadr_t& a)
{ {
static char s[64]; static char s[64];
@ -394,7 +382,6 @@ char *NET_BaseAdrToString(netadr_t& a)
return s; return s;
} }
/* <d3446> ../engine/net_ws.c:410 */
qboolean NET_StringToSockaddr(const char *s, struct sockaddr *sadr) qboolean NET_StringToSockaddr(const char *s, struct sockaddr *sadr)
{ {
struct hostent *h; struct hostent *h;
@ -501,7 +488,6 @@ qboolean NET_StringToSockaddr(const char *s, struct sockaddr *sadr)
return TRUE; return TRUE;
} }
/* <d2eca> ../engine/net_ws.c:483 */
qboolean NET_StringToAdr(const char *s, netadr_t *a) qboolean NET_StringToAdr(const char *s, netadr_t *a)
{ {
struct sockaddr sadr; struct sockaddr sadr;
@ -522,13 +508,20 @@ qboolean NET_StringToAdr(const char *s, netadr_t *a)
return TRUE; return TRUE;
} }
/* <d3579> ../engine/net_ws.c:502 */
qboolean NET_IsLocalAddress(netadr_t& adr) qboolean NET_IsLocalAddress(netadr_t& adr)
{ {
return adr.type == NA_LOOPBACK ? TRUE : FALSE; return adr.type == NA_LOOPBACK ? TRUE : FALSE;
} }
/* <d2cb1> ../engine/net_ws.c:570 */ int NET_GetLastError()
{
#ifdef _WIN32
return CRehldsPlatformHolder::get()->WSAGetLastError();
#else
return errno;
#endif // _WIN32
}
char *NET_ErrorString(int code) char *NET_ErrorString(int code)
{ {
#ifdef _WIN32 #ifdef _WIN32
@ -591,7 +584,6 @@ char *NET_ErrorString(int code)
#endif // _WIN32 #endif // _WIN32
} }
/* <d35c3> ../engine/net_ws.c:583 */
void NET_TransferRawData(sizebuf_t *msg, unsigned char *pStart, int nSize) void NET_TransferRawData(sizebuf_t *msg, unsigned char *pStart, int nSize)
{ {
#ifdef REHLDS_CHECKS #ifdef REHLDS_CHECKS
@ -604,7 +596,6 @@ void NET_TransferRawData(sizebuf_t *msg, unsigned char *pStart, int nSize)
msg->cursize = nSize; msg->cursize = nSize;
} }
/* <d2f3c> ../engine/net_ws.c:589 */
qboolean NET_GetLoopPacket(netsrc_t sock, netadr_t *in_from_, sizebuf_t *msg) qboolean NET_GetLoopPacket(netsrc_t sock, netadr_t *in_from_, sizebuf_t *msg)
{ {
int i; int i;
@ -632,7 +623,6 @@ qboolean NET_GetLoopPacket(netsrc_t sock, netadr_t *in_from_, sizebuf_t *msg)
return FALSE; return FALSE;
} }
/* <d3659> ../engine/net_ws.c:612 */
void NET_SendLoopPacket(netsrc_t sock, int length, void *data, const netadr_t& to) void NET_SendLoopPacket(netsrc_t sock, int length, void *data, const netadr_t& to)
{ {
int i; int i;
@ -658,7 +648,6 @@ void NET_SendLoopPacket(netsrc_t sock, int length, void *data, const netadr_t& t
NET_ThreadUnlock(); NET_ThreadUnlock();
} }
/* <d36f6> ../engine/net_ws.c:639 */
void NET_RemoveFromPacketList(packetlag_t *pPacket) void NET_RemoveFromPacketList(packetlag_t *pPacket)
{ {
pPacket->pPrev->pNext = pPacket->pNext; pPacket->pPrev->pNext = pPacket->pNext;
@ -667,7 +656,6 @@ void NET_RemoveFromPacketList(packetlag_t *pPacket)
pPacket->pNext = 0; pPacket->pNext = 0;
} }
/* <d3713> ../engine/net_ws.c:647 */
NOXREF int NET_CountLaggedList(packetlag_t *pList) NOXREF int NET_CountLaggedList(packetlag_t *pList)
{ {
NOXREFCHECK; NOXREFCHECK;
@ -686,7 +674,6 @@ NOXREF int NET_CountLaggedList(packetlag_t *pList)
return c; return c;
} }
/* <d378c> ../engine/net_ws.c:666 */
void NET_ClearLaggedList(packetlag_t *pList) void NET_ClearLaggedList(packetlag_t *pList)
{ {
packetlag_t *p, *n; packetlag_t *p, *n;
@ -709,7 +696,6 @@ void NET_ClearLaggedList(packetlag_t *pList)
pList->pNext = pList; pList->pNext = pList;
} }
/* <d37d6> ../engine/net_ws.c:695 */
void NET_AddToLagged(netsrc_t sock, packetlag_t *pList, packetlag_t *pPacket, netadr_t *net_from_, sizebuf_t messagedata, float timestamp) void NET_AddToLagged(netsrc_t sock, packetlag_t *pList, packetlag_t *pPacket, netadr_t *net_from_, sizebuf_t messagedata, float timestamp)
{ {
unsigned char *pStart; unsigned char *pStart;
@ -733,7 +719,6 @@ void NET_AddToLagged(netsrc_t sock, packetlag_t *pList, packetlag_t *pPacket, ne
Q_memcpy(&pPacket->net_from_, net_from_, sizeof(netadr_t)); Q_memcpy(&pPacket->net_from_, net_from_, sizeof(netadr_t));
} }
/* <d385e> ../engine/net_ws.c:731 */
void NET_AdjustLag(void) void NET_AdjustLag(void)
{ {
static double lasttime = realtime; static double lasttime = realtime;
@ -776,7 +761,6 @@ void NET_AdjustLag(void)
} }
} }
/* <d38ba> ../engine/net_ws.c:784 */
qboolean NET_LagPacket(qboolean newdata, netsrc_t sock, netadr_t *from, sizebuf_t *data) qboolean NET_LagPacket(qboolean newdata, netsrc_t sock, netadr_t *from, sizebuf_t *data)
{ {
packetlag_t *pNewPacketLag; packetlag_t *pNewPacketLag;
@ -843,7 +827,6 @@ qboolean NET_LagPacket(qboolean newdata, netsrc_t sock, netadr_t *from, sizebuf_
return TRUE; return TRUE;
} }
/* <d3ae2> ../engine/net_ws.c:869 */
void NET_FlushSocket(netsrc_t sock) void NET_FlushSocket(netsrc_t sock)
{ {
struct sockaddr from; struct sockaddr from;
@ -864,15 +847,14 @@ void NET_FlushSocket(netsrc_t sock)
} }
} }
/* <d2cf1> ../engine/net_ws.c:911 */
qboolean NET_GetLong(unsigned char *pData, int size, int *outSize) qboolean NET_GetLong(unsigned char *pData, int size, int *outSize)
{ {
unsigned int packetNumber; // 913 unsigned int packetNumber;
unsigned int packetCount; // 913 unsigned int packetCount;
int sequenceNumber; // 913 int sequenceNumber;
unsigned char packetID; // 914 unsigned char packetID;
static int gNetSplitFlags[NET_WS_MAX_FRAGMENTS]; // 918 static int gNetSplitFlags[NET_WS_MAX_FRAGMENTS];
SPLITPACKET *pHeader = (SPLITPACKET *) pData; // 915 SPLITPACKET *pHeader = (SPLITPACKET *) pData;
sequenceNumber = pHeader->sequenceNumber; sequenceNumber = pHeader->sequenceNumber;
packetID = pHeader->packetID; packetID = pHeader->packetID;
@ -975,16 +957,14 @@ qboolean NET_GetLong(unsigned char *pData, int size, int *outSize)
} }
} }
/* <d3bd9> ../engine/net_ws.c:1021 */
qboolean NET_QueuePacket(netsrc_t sock) qboolean NET_QueuePacket(netsrc_t sock)
{ {
int ret; // 1023 int ret;
struct sockaddr from; // 1024 struct sockaddr from;
socklen_t fromlen; // 1025 socklen_t fromlen;
int net_socket; // 1026 int net_socket;
int protocol; // 1027 int protocol;
int err; // 1028 unsigned char buf[MAX_UDP_PACKET];
unsigned char buf[MAX_UDP_PACKET]; // 1029
#ifdef REHLDS_FIXES #ifdef REHLDS_FIXES
ret = -1; ret = -1;
@ -1014,19 +994,15 @@ qboolean NET_QueuePacket(netsrc_t sock)
ret = CRehldsPlatformHolder::get()->recvfrom(net_socket, (char *)buf, sizeof buf, 0, &from, &fromlen); ret = CRehldsPlatformHolder::get()->recvfrom(net_socket, (char *)buf, sizeof buf, 0, &from, &fromlen);
if (ret == -1) if (ret == -1)
{ {
int err = NET_GetLastError();
#ifdef _WIN32 #ifdef _WIN32
err = CRehldsPlatformHolder::get()->WSAGetLastError(); if (err == WSAENETRESET)
if (err != WSAENETRESET && err != WSAEWOULDBLOCK && err != WSAECONNRESET && err != WSAECONNREFUSED) continue;
#else // _WIN32
err = errno;
if (err != EAGAIN && err != ECONNRESET && err != ECONNREFUSED)
#endif // _WIN32 #endif // _WIN32
if (err != WSAEWOULDBLOCK && err != WSAECONNRESET && err != WSAECONNREFUSED)
{ {
#ifdef _WIN32
if (err == WSAEMSGSIZE) if (err == WSAEMSGSIZE)
#else // _WIN32
if (err == EMSGSIZE)
#endif // _WIN32
{ {
Con_DPrintf("NET_QueuePacket: Ignoring oversized network message\n"); Con_DPrintf("NET_QueuePacket: Ignoring oversized network message\n");
} }
@ -1040,6 +1016,7 @@ qboolean NET_QueuePacket(netsrc_t sock)
} }
continue; continue;
} }
SockadrToNetadr(&from, &in_from); SockadrToNetadr(&from, &in_from);
if (ret != MAX_UDP_PACKET) if (ret != MAX_UDP_PACKET)
break; break;
@ -1070,7 +1047,6 @@ qboolean NET_QueuePacket(netsrc_t sock)
} }
} }
/* <d3e26> ../engine/net_ws.c:1145 */
DLL_EXPORT int NET_Sleep_Timeout(void) DLL_EXPORT int NET_Sleep_Timeout(void)
{ {
fd_set fdset; fd_set fdset;
@ -1114,7 +1090,7 @@ DLL_EXPORT int NET_Sleep_Timeout(void)
if (number < sock) if (number < sock)
number = sock; number = sock;
#ifdef _WIN32 #ifdef _WIN32
sock = ipx_sockets[i]; sock = ipx_sockets[i];
@ -1145,11 +1121,10 @@ DLL_EXPORT int NET_Sleep_Timeout(void)
} }
} }
/* <d3f09> ../engine/net_ws.c:1211 */
int NET_Sleep(void) int NET_Sleep(void)
{ {
fd_set fdset; fd_set fdset;
struct timeval tv; struct timeval tv;
int number; int number;
FD_ZERO(&fdset); FD_ZERO(&fdset);
@ -1186,7 +1161,6 @@ int NET_Sleep(void)
return select(number + 1, &fdset, 0, 0, net_sleepforever == 0 ? &tv : NULL); return select(number + 1, &fdset, 0, 0, net_sleepforever == 0 ? &tv : NULL);
} }
/* <d3f90> ../engine/net_ws.c:1308 */
void NET_StartThread(void) void NET_StartThread(void)
{ {
if (use_thread) if (use_thread)
@ -1212,7 +1186,6 @@ void NET_StartThread(void)
} }
} }
/* <d3fa0> ../engine/net_ws.c:1333 */
void NET_StopThread(void) void NET_StopThread(void)
{ {
if (use_thread) if (use_thread)
@ -1231,13 +1204,11 @@ void NET_StopThread(void)
} }
} }
/* <d2c6f> ../engine/net_ws.c:1348 */
void *net_malloc(size_t size) void *net_malloc(size_t size)
{ {
return Mem_ZeroMalloc(size); return Mem_ZeroMalloc(size);
} }
/* <d3fd2> ../engine/net_ws.c:1355 */
net_messages_t *NET_AllocMsg(int size) net_messages_t *NET_AllocMsg(int size)
{ {
net_messages_t *pmsg; net_messages_t *pmsg;
@ -1254,11 +1225,10 @@ net_messages_t *NET_AllocMsg(int size)
pmsg->buffersize = size; pmsg->buffersize = size;
pmsg->preallocated = FALSE; pmsg->preallocated = FALSE;
} }
return pmsg; return pmsg;
} }
/* <d4068> ../engine/net_ws.c:1377 */
void NET_FreeMsg(net_messages_t *pmsg) void NET_FreeMsg(net_messages_t *pmsg)
{ {
if (pmsg->preallocated) if (pmsg->preallocated)
@ -1274,11 +1244,10 @@ void NET_FreeMsg(net_messages_t *pmsg)
} }
} }
/* <d40a2> ../engine/net_ws.c:1391 */
qboolean NET_GetPacket(netsrc_t sock) qboolean NET_GetPacket(netsrc_t sock)
{ {
net_messages_t *pmsg; // 1393 net_messages_t *pmsg;
qboolean bret; // 1396 qboolean bret;
NET_AdjustLag(); NET_AdjustLag();
NET_ThreadLock(); NET_ThreadLock();
@ -1299,7 +1268,7 @@ qboolean NET_GetPacket(netsrc_t sock)
bret = NET_LagPacket(0, sock, 0, 0); bret = NET_LagPacket(0, sock, 0, 0);
} }
} }
if (bret) if (bret)
{ {
Q_memcpy(net_message.data, in_message.data, in_message.cursize); Q_memcpy(net_message.data, in_message.data, in_message.cursize);
@ -1324,7 +1293,6 @@ qboolean NET_GetPacket(netsrc_t sock)
return bret; return bret;
} }
/* <d41a9> ../engine/net_ws.c:1454 */
void NET_AllocateQueues(void) void NET_AllocateQueues(void)
{ {
net_messages_t *p; net_messages_t *p;
@ -1340,7 +1308,6 @@ void NET_AllocateQueues(void)
NET_StartThread(); NET_StartThread();
} }
/* <d420f> ../engine/net_ws.c:1473 */
void NET_FlushQueues(void) void NET_FlushQueues(void)
{ {
for (int i = 0; i < 3; i++) for (int i = 0; i < 3; i++)
@ -1366,7 +1333,6 @@ void NET_FlushQueues(void)
normalqueue = NULL; normalqueue = NULL;
} }
/* <d2d9f> ../engine/net_ws.c:1504 */
int NET_SendLong(netsrc_t sock, int s, const char *buf, int len, int flags, const struct sockaddr *to, int tolen) int NET_SendLong(netsrc_t sock, int s, const char *buf, int len, int flags, const struct sockaddr *to, int tolen)
{ {
static long gSequenceNumber = 1; static long gSequenceNumber = 1;
@ -1444,13 +1410,12 @@ void EXT_FUNC NET_SendPacket_api(unsigned int length, void *data, const netadr_t
NET_SendPacket(NS_SERVER, length, data, to); NET_SendPacket(NS_SERVER, length, data, to);
} }
/* <d43aa> ../engine/net_ws.c:1599 */
void NET_SendPacket(netsrc_t sock, int length, void *data, const netadr_t& to) void NET_SendPacket(netsrc_t sock, int length, void *data, const netadr_t& to)
{ {
int ret; int ret;
struct sockaddr addr; struct sockaddr addr;
int net_socket; int net_socket;
if (to.type == NA_LOOPBACK) if (to.type == NA_LOOPBACK)
{ {
NET_SendLoopPacket(sock, length, data, to); NET_SendLoopPacket(sock, length, data, to);
@ -1464,7 +1429,7 @@ void NET_SendPacket(netsrc_t sock, int length, void *data, const netadr_t& to)
if (net_socket == INVALID_SOCKET) if (net_socket == INVALID_SOCKET)
#else #else
if (!net_socket) if (!net_socket)
#endif #endif // REHLDS_FIXES
return; return;
} }
else if (to.type == NA_IP) else if (to.type == NA_IP)
@ -1474,7 +1439,7 @@ void NET_SendPacket(netsrc_t sock, int length, void *data, const netadr_t& to)
if (net_socket == INVALID_SOCKET) if (net_socket == INVALID_SOCKET)
#else #else
if (!net_socket) if (!net_socket)
#endif #endif // REHLDS_FIXES
return; return;
} }
#ifdef _WIN32 #ifdef _WIN32
@ -1485,7 +1450,7 @@ void NET_SendPacket(netsrc_t sock, int length, void *data, const netadr_t& to)
if (net_socket == INVALID_SOCKET) if (net_socket == INVALID_SOCKET)
#else #else
if (!net_socket) if (!net_socket)
#endif #endif // REHLDS_FIXES
return; return;
} }
else if (to.type == NA_BROADCAST_IPX) else if (to.type == NA_BROADCAST_IPX)
@ -1495,7 +1460,7 @@ void NET_SendPacket(netsrc_t sock, int length, void *data, const netadr_t& to)
if (net_socket == INVALID_SOCKET) if (net_socket == INVALID_SOCKET)
#else #else
if (!net_socket) if (!net_socket)
#endif #endif // REHLDS_FIXES
return; return;
} }
#endif // _WIN32 #endif // _WIN32
@ -1509,13 +1474,8 @@ void NET_SendPacket(netsrc_t sock, int length, void *data, const netadr_t& to)
ret = NET_SendLong(sock, net_socket, (const char *)data, length, 0, &addr, sizeof(addr)); ret = NET_SendLong(sock, net_socket, (const char *)data, length, 0, &addr, sizeof(addr));
if (ret == -1) if (ret == -1)
{ {
int err; int err = NET_GetLastError();
#ifdef _WIN32
err = WSAGetLastError();
#else // _WIN32
err = errno;
#endif // _WIN32
// wouldblock is silent // wouldblock is silent
if (err == WSAEWOULDBLOCK) if (err == WSAEWOULDBLOCK)
return; return;
@ -1531,7 +1491,8 @@ void NET_SendPacket(netsrc_t sock, int length, void *data, const netadr_t& to)
)) ))
return; return;
if (g_pcls.state == ca_dedicated) // let dedicated servers continue after errors // let dedicated servers continue after errors
if (g_pcls.state == ca_dedicated)
{ {
Con_Printf(__FUNCTION__ " ERROR: %s\n", NET_ErrorString(err)); Con_Printf(__FUNCTION__ " ERROR: %s\n", NET_ErrorString(err));
} }
@ -1549,7 +1510,6 @@ void NET_SendPacket(netsrc_t sock, int length, void *data, const netadr_t& to)
} }
} }
/* <d455d> ../engine/net_ws.c:1700 */
int NET_IPSocket(char *net_interface, int port, qboolean multicast) int NET_IPSocket(char *net_interface, int port, qboolean multicast)
{ {
int newsocket; int newsocket;
@ -1570,14 +1530,12 @@ int NET_IPSocket(char *net_interface, int port, qboolean multicast)
if ((newsocket = socket(PF_INET, SOCK_DGRAM, IPPROTO_UDP)) == INVALID_SOCKET) if ((newsocket = socket(PF_INET, SOCK_DGRAM, IPPROTO_UDP)) == INVALID_SOCKET)
#endif // _WIN32 #endif // _WIN32
{ {
err = NET_GetLastError();
#ifdef _WIN32
err = CRehldsPlatformHolder::get()->WSAGetLastError();
#else
err = errno;
#endif // _WIN32
if (err != WSAEAFNOSUPPORT) if (err != WSAEAFNOSUPPORT)
{
Con_Printf("WARNING: UDP_OpenSocket: port: %d socket: %s", port, NET_ErrorString(err)); Con_Printf("WARNING: UDP_OpenSocket: port: %d socket: %s", port, NET_ErrorString(err));
}
return invalid_socket; return invalid_socket;
} }
#ifdef _WIN32 #ifdef _WIN32
@ -1586,12 +1544,7 @@ int NET_IPSocket(char *net_interface, int port, qboolean multicast)
if (SOCKET_FIONBIO(newsocket, _true) == SOCKET_ERROR) if (SOCKET_FIONBIO(newsocket, _true) == SOCKET_ERROR)
#endif // _WIN32 #endif // _WIN32
{ {
#ifdef _WIN32 Con_Printf("WARNING: UDP_OpenSocket: port: %d ioctl FIONBIO: %s\n", port, NET_ErrorString(NET_GetLastError()));
err = CRehldsPlatformHolder::get()->WSAGetLastError();
#else
err = errno;
#endif // _WIN32
Con_Printf("WARNING: UDP_OpenSocket: port: %d ioctl FIONBIO: %s\n", port, NET_ErrorString(err));
return invalid_socket; return invalid_socket;
} }
#ifdef _WIN32 #ifdef _WIN32
@ -1600,12 +1553,7 @@ int NET_IPSocket(char *net_interface, int port, qboolean multicast)
if (setsockopt(newsocket, SOL_SOCKET, SO_BROADCAST, (char *)&i, sizeof(i)) == SOCKET_ERROR) if (setsockopt(newsocket, SOL_SOCKET, SO_BROADCAST, (char *)&i, sizeof(i)) == SOCKET_ERROR)
#endif #endif
{ {
#ifdef _WIN32 Con_Printf ("WARNING: UDP_OpenSocket: port: %d setsockopt SO_BROADCAST: %s\n", port, NET_ErrorString(NET_GetLastError()));
err = CRehldsPlatformHolder::get()->WSAGetLastError();
#else
err = errno;
#endif // _WIN32
Con_Printf ("WARNING: UDP_OpenSocket: port: %d setsockopt SO_BROADCAST: %s\n", port, NET_ErrorString(err));
return invalid_socket; return invalid_socket;
} }
if (COM_CheckParm("-reuse") || multicast) if (COM_CheckParm("-reuse") || multicast)
@ -1616,12 +1564,7 @@ int NET_IPSocket(char *net_interface, int port, qboolean multicast)
if (setsockopt(newsocket, SOL_SOCKET, SO_REUSEADDR, (char *)&_true, sizeof(qboolean)) == SOCKET_ERROR) if (setsockopt(newsocket, SOL_SOCKET, SO_REUSEADDR, (char *)&_true, sizeof(qboolean)) == SOCKET_ERROR)
#endif // _WIN32 #endif // _WIN32
{ {
#ifdef _WIN32 Con_Printf ("WARNING: UDP_OpenSocket: port: %d setsockopt SO_REUSEADDR: %s\n", port, NET_ErrorString(NET_GetLastError()));
err = CRehldsPlatformHolder::get()->WSAGetLastError();
#else
err = errno;
#endif // _WIN32
Con_Printf ("WARNING: UDP_OpenSocket: port: %d setsockopt SO_REUSEADDR: %s\n", port, NET_ErrorString(err));
return invalid_socket; return invalid_socket;
} }
} }
@ -1632,7 +1575,7 @@ int NET_IPSocket(char *net_interface, int port, qboolean multicast)
Con_Printf("Enabling LOWDELAY TOS option\n"); Con_Printf("Enabling LOWDELAY TOS option\n");
if (setsockopt(newsocket, IPPROTO_IP, IP_TOS, (char *)&i, sizeof(i)) == SOCKET_ERROR) if (setsockopt(newsocket, IPPROTO_IP, IP_TOS, (char *)&i, sizeof(i)) == SOCKET_ERROR)
{ {
err = errno; err = NET_GetLastError();
if (err != WSAENOPROTOOPT) if (err != WSAENOPROTOOPT)
Con_Printf("WARNING: UDP_OpenSocket: port: %d setsockopt IP_TOS: %s\n", port, NET_ErrorString(err)); Con_Printf("WARNING: UDP_OpenSocket: port: %d setsockopt IP_TOS: %s\n", port, NET_ErrorString(err));
return invalid_socket; return invalid_socket;
@ -1641,7 +1584,7 @@ int NET_IPSocket(char *net_interface, int port, qboolean multicast)
#endif // _WIN32 #endif // _WIN32
if (net_interface && *net_interface && Q_stricmp(net_interface, "localhost")) if (net_interface && *net_interface && Q_stricmp(net_interface, "localhost"))
NET_StringToSockaddr(net_interface, (sockaddr *)&address); NET_StringToSockaddr(net_interface, (sockaddr *)&address);
else else
address.sin_addr.s_addr = INADDR_ANY; address.sin_addr.s_addr = INADDR_ANY;
if (port == -1) if (port == -1)
@ -1655,12 +1598,7 @@ int NET_IPSocket(char *net_interface, int port, qboolean multicast)
if (bind(newsocket, (struct sockaddr *)&address, sizeof(address)) == SOCKET_ERROR) if (bind(newsocket, (struct sockaddr *)&address, sizeof(address)) == SOCKET_ERROR)
#endif // _WIN32 #endif // _WIN32
{ {
#ifdef _WIN32 Con_Printf("WARNING: UDP_OpenSocket: port: %d bind: %s\n", port, NET_ErrorString(NET_GetLastError()));
err = CRehldsPlatformHolder::get()->WSAGetLastError();
#else
err = errno;
#endif // _WIN32
Con_Printf("WARNING: UDP_OpenSocket: port: %d bind: %s\n", port, NET_ErrorString(err));
#ifdef _WIN32 #ifdef _WIN32
CRehldsPlatformHolder::get()->closesocket(newsocket); CRehldsPlatformHolder::get()->closesocket(newsocket);
#else #else
@ -1675,27 +1613,20 @@ int NET_IPSocket(char *net_interface, int port, qboolean multicast)
if (setsockopt(newsocket, IPPROTO_IP, IP_MULTICAST_LOOP, (char *)&i, sizeof(i)) == SOCKET_ERROR) if (setsockopt(newsocket, IPPROTO_IP, IP_MULTICAST_LOOP, (char *)&i, sizeof(i)) == SOCKET_ERROR)
#endif // _WIN32 #endif // _WIN32
{ {
#ifdef _WIN32 Con_DPrintf("WARNING: UDP_OpenSocket: port %d setsockopt IP_MULTICAST_LOOP: %s\n", port, NET_ErrorString(NET_GetLastError()));
err = CRehldsPlatformHolder::get()->WSAGetLastError();
#else
err = errno;
#endif // _WIN32
Con_DPrintf("WARNING: UDP_OpenSocket: port %d setsockopt IP_MULTICAST_LOOP: %s\n", port, NET_ErrorString(err));
} }
#if defined __linux__ && defined REHLDS_FIXES #if defined __linux__ && defined REHLDS_FIXES
i = IP_PMTUDISC_DONT; i = IP_PMTUDISC_DONT;
if (setsockopt(newsocket, IPPROTO_IP, IP_MTU_DISCOVER, (char *)&i, sizeof(i)) == SOCKET_ERROR) if (setsockopt(newsocket, IPPROTO_IP, IP_MTU_DISCOVER, (char *)&i, sizeof(i)) == SOCKET_ERROR)
{ {
err = errno; Con_Printf("WARNING: UDP_OpenSocket: port %d setsockopt IP_MTU_DISCOVER: %s\n", port, NET_ErrorString(NET_GetLastError()));
Con_Printf("WARNING: UDP_OpenSocket: port %d setsockopt IP_MTU_DISCOVER: %s\n", port, NET_ErrorString(err));
} }
#endif #endif
return newsocket; return newsocket;
} }
/* <d470a> ../engine/net_ws.c:1842 */
void NET_OpenIP(void) void NET_OpenIP(void)
{ {
//cvar_t *ip;//unused? //cvar_t *ip;//unused?
@ -1794,7 +1725,6 @@ void NET_OpenIP(void)
#ifdef _WIN32 #ifdef _WIN32
/* <???> ../engine/net_ws.c */
int NET_IPXSocket(int hostshort) int NET_IPXSocket(int hostshort)
{ {
int err; int err;
@ -1810,27 +1740,31 @@ int NET_IPXSocket(int hostshort)
if((newsocket = CRehldsPlatformHolder::get()->socket(PF_IPX, SOCK_DGRAM, NSPROTO_IPX)) == INVALID_SOCKET) if((newsocket = CRehldsPlatformHolder::get()->socket(PF_IPX, SOCK_DGRAM, NSPROTO_IPX)) == INVALID_SOCKET)
{ {
err = CRehldsPlatformHolder::get()->WSAGetLastError(); err = NET_GetLastError();
if (err != WSAEAFNOSUPPORT) if (err != WSAEAFNOSUPPORT)
{
Con_Printf("WARNING: IPX_Socket: port: %d socket: %s\n", hostshort, NET_ErrorString(err)); Con_Printf("WARNING: IPX_Socket: port: %d socket: %s\n", hostshort, NET_ErrorString(err));
}
return invalid_socket; return invalid_socket;
} }
if (CRehldsPlatformHolder::get()->ioctlsocket(newsocket, FIONBIO, &optval) == SOCKET_ERROR) if (CRehldsPlatformHolder::get()->ioctlsocket(newsocket, FIONBIO, &optval) == SOCKET_ERROR)
{ {
err = CRehldsPlatformHolder::get()->WSAGetLastError(); err = NET_GetLastError();
Con_Printf("WARNING: IPX_Socket: port: %d ioctl FIONBIO: %s\n", hostshort, NET_ErrorString(err)); Con_Printf("WARNING: IPX_Socket: port: %d ioctl FIONBIO: %s\n", hostshort, NET_ErrorString(err));
return invalid_socket; return invalid_socket;
} }
if (CRehldsPlatformHolder::get()->setsockopt(newsocket, SOL_SOCKET, SO_BROADCAST, (const char *)&optval, sizeof(optval)) == SOCKET_ERROR) if (CRehldsPlatformHolder::get()->setsockopt(newsocket, SOL_SOCKET, SO_BROADCAST, (const char *)&optval, sizeof(optval)) == SOCKET_ERROR)
{ {
err = CRehldsPlatformHolder::get()->WSAGetLastError(); err = NET_GetLastError();
Con_Printf("WARNING: IPX_Socket: port: %d setsockopt SO_BROADCAST: %s\n", hostshort, NET_ErrorString(err)); Con_Printf("WARNING: IPX_Socket: port: %d setsockopt SO_BROADCAST: %s\n", hostshort, NET_ErrorString(err));
return invalid_socket; return invalid_socket;
} }
if (CRehldsPlatformHolder::get()->setsockopt(newsocket, SOL_SOCKET, 4, (const char *)&optval, sizeof(optval)) == SOCKET_ERROR) if (CRehldsPlatformHolder::get()->setsockopt(newsocket, SOL_SOCKET, 4, (const char *)&optval, sizeof(optval)) == SOCKET_ERROR)
{ {
err = CRehldsPlatformHolder::get()->WSAGetLastError(); #ifndef REHLDS_FIXES
err = NET_GetLastError();
#endif
return invalid_socket; return invalid_socket;
} }
@ -1841,10 +1775,10 @@ int NET_IPXSocket(int hostshort)
if (hostshort == -1) if (hostshort == -1)
address.sa_socket = 0; address.sa_socket = 0;
else address.sa_socket = htons((u_short)hostshort); else address.sa_socket = htons((u_short)hostshort);
if (CRehldsPlatformHolder::get()->bind(newsocket, (struct sockaddr *)&address, sizeof(SOCKADDR_IPX)) == SOCKET_ERROR) if (CRehldsPlatformHolder::get()->bind(newsocket, (struct sockaddr *)&address, sizeof(SOCKADDR_IPX)) == SOCKET_ERROR)
{ {
err = CRehldsPlatformHolder::get()->WSAGetLastError(); err = NET_GetLastError();
Con_Printf("WARNING: IPX_Socket: port: %d bind: %s\n", hostshort, NET_ErrorString(err)); Con_Printf("WARNING: IPX_Socket: port: %d bind: %s\n", hostshort, NET_ErrorString(err));
CRehldsPlatformHolder::get()->closesocket(newsocket); CRehldsPlatformHolder::get()->closesocket(newsocket);
return invalid_socket; return invalid_socket;
@ -1852,12 +1786,11 @@ int NET_IPXSocket(int hostshort)
return newsocket; return newsocket;
} }
/* <???> ../engine/net_ws.c */
void NET_OpenIPX(void) void NET_OpenIPX(void)
{ {
int port; int port;
int dedicated; int dedicated;
dedicated = g_pcls.state == ca_dedicated; dedicated = g_pcls.state == ca_dedicated;
NET_ThreadLock(); NET_ThreadLock();
if (!ipx_sockets[NS_SERVER]) if (!ipx_sockets[NS_SERVER])
@ -1898,7 +1831,6 @@ void NET_OpenIPX(void)
#endif // _WIN32 #endif // _WIN32
/* <d4799> ../engine/net_ws.c:2076 */
void NET_GetLocalAddress(void) void NET_GetLocalAddress(void)
{ {
char buff[512]; char buff[512];
@ -1946,11 +1878,8 @@ void NET_GetLocalAddress(void)
#endif // _WIN32 #endif // _WIN32
{ {
noip = TRUE; noip = TRUE;
#ifdef _WIN32 net_error = NET_GetLastError();
net_error = CRehldsPlatformHolder::get()->WSAGetLastError();
#else
net_error = errno;
#endif // _WIN32
Con_Printf("Could not get TCP/IP address, TCP/IP disabled\nReason: %s\n", NET_ErrorString(net_error)); Con_Printf("Could not get TCP/IP address, TCP/IP disabled\nReason: %s\n", NET_ErrorString(net_error));
} }
else else
@ -1980,7 +1909,7 @@ void NET_GetLocalAddress(void)
if (CRehldsPlatformHolder::get()->getsockname(ipx_sockets[NS_SERVER], (struct sockaddr *)&address, (socklen_t *)&namelen) == SOCKET_ERROR) if (CRehldsPlatformHolder::get()->getsockname(ipx_sockets[NS_SERVER], (struct sockaddr *)&address, (socklen_t *)&namelen) == SOCKET_ERROR)
{ {
noipx = TRUE; noipx = TRUE;
net_error = CRehldsPlatformHolder::get()->WSAGetLastError(); net_error = NET_GetLastError();
} }
else else
{ {
@ -1991,13 +1920,11 @@ void NET_GetLocalAddress(void)
#endif //_WIN32 #endif //_WIN32
} }
/* <d4978> ../engine/net_ws.c:2170 */
int NET_IsConfigured(void) int NET_IsConfigured(void)
{ {
return net_configured; return net_configured;
} }
/* <d4991> ../engine/net_ws.c:2182 */
void NET_Config(qboolean multiplayer) void NET_Config(qboolean multiplayer)
{ {
int i; int i;
@ -2031,7 +1958,7 @@ void NET_Config(qboolean multiplayer)
const int invalid_socket = INVALID_SOCKET; const int invalid_socket = INVALID_SOCKET;
#else #else
const int invalid_socket = 0; const int invalid_socket = 0;
#endif #endif // REHLDS_FIXES
NET_ThreadLock(); NET_ThreadLock();
for (i = 0; i < 3; i++) for (i = 0; i < 3; i++)
{ {
@ -2055,10 +1982,10 @@ void NET_Config(qboolean multiplayer)
} }
NET_ThreadUnlock(); NET_ThreadUnlock();
} }
net_configured = multiplayer ? 1 : 0; net_configured = multiplayer ? 1 : 0;
} }
/* <d2b97> ../engine/net_ws.c:2259 */
void MaxPlayers_f(void) void MaxPlayers_f(void)
{ {
if (Cmd_Argc() != 2) if (Cmd_Argc() != 2)
@ -2067,7 +1994,7 @@ void MaxPlayers_f(void)
return; return;
} }
if (g_psv.active) if (g_psv.active)
{ {
Con_Printf("maxplayers cannot be changed while a server is running.\n"); Con_Printf("maxplayers cannot be changed while a server is running.\n");
@ -2092,7 +2019,6 @@ void MaxPlayers_f(void)
Cvar_Set("deathmatch", "1"); Cvar_Set("deathmatch", "1");
} }
/* <d49ce> ../engine/net_ws.c:2315 */
void NET_Init(void) void NET_Init(void)
{ {
#ifdef HOOK_ENGINE #ifdef HOOK_ENGINE
@ -2138,7 +2064,7 @@ void NET_Init(void)
int port = COM_CheckParm("-port"); int port = COM_CheckParm("-port");
if (port) if (port)
Cvar_SetValue("hostport", Q_atof(com_argv[port + 1])); Cvar_SetValue("hostport", Q_atof(com_argv[port + 1]));
int clockwindow_ = COM_CheckParm("-clockwindow"); int clockwindow_ = COM_CheckParm("-clockwindow");
if (clockwindow_) if (clockwindow_)
Cvar_SetValue("clockwindow", Q_atof(com_argv[clockwindow_ + 1])); Cvar_SetValue("clockwindow", Q_atof(com_argv[clockwindow_ + 1]));
@ -2163,7 +2089,6 @@ void NET_Init(void)
Con_DPrintf("Base networking initialized.\n"); Con_DPrintf("Base networking initialized.\n");
} }
/* <d4a6c> ../engine/net_ws.c:2424 */
void NET_ClearLagData(qboolean bClient, qboolean bServer) void NET_ClearLagData(qboolean bClient, qboolean bServer)
{ {
NET_ThreadLock(); NET_ThreadLock();
@ -2182,7 +2107,6 @@ void NET_ClearLagData(qboolean bClient, qboolean bServer)
NET_ThreadUnlock(); NET_ThreadUnlock();
} }
/* <d4b88> ../engine/net_ws.c:2449 */
void NET_Shutdown(void) void NET_Shutdown(void)
{ {
NET_ThreadLock(); NET_ThreadLock();
@ -2196,7 +2120,6 @@ void NET_Shutdown(void)
NET_FlushQueues(); NET_FlushQueues();
} }
/* <d4ccb> ../engine/net_ws.c:2470 */
qboolean NET_JoinGroup(netsrc_t sock, netadr_t& addr) qboolean NET_JoinGroup(netsrc_t sock, netadr_t& addr)
{ {
ip_mreq mreq; ip_mreq mreq;
@ -2206,13 +2129,8 @@ qboolean NET_JoinGroup(netsrc_t sock, netadr_t& addr)
if (CRehldsPlatformHolder::get()->setsockopt(net_socket, IPPROTO_IP, IP_ADD_MEMBERSHIP, (char*)&mreq, sizeof(mreq)) == SOCKET_ERROR) if (CRehldsPlatformHolder::get()->setsockopt(net_socket, IPPROTO_IP, IP_ADD_MEMBERSHIP, (char*)&mreq, sizeof(mreq)) == SOCKET_ERROR)
{ {
#ifdef _WIN32 int err = NET_GetLastError();
int err = WSAGetLastError();
if (err != WSAEAFNOSUPPORT) if (err != WSAEAFNOSUPPORT)
#else
int err = errno;
if (err != EAFNOSUPPORT)
#endif // _WIN32
{ {
Con_Printf("WARNING: NET_JoinGroup: IP_ADD_MEMBERSHIP: %s", NET_ErrorString(err)); Con_Printf("WARNING: NET_JoinGroup: IP_ADD_MEMBERSHIP: %s", NET_ErrorString(err));
} }
@ -2222,7 +2140,6 @@ qboolean NET_JoinGroup(netsrc_t sock, netadr_t& addr)
return TRUE; return TRUE;
} }
/* <d4d51> ../engine/net_ws.c:2504 */
qboolean NET_LeaveGroup(netsrc_t sock, netadr_t& addr) qboolean NET_LeaveGroup(netsrc_t sock, netadr_t& addr)
{ {
ip_mreq mreq; ip_mreq mreq;
@ -2232,13 +2149,8 @@ qboolean NET_LeaveGroup(netsrc_t sock, netadr_t& addr)
if (CRehldsPlatformHolder::get()->setsockopt(net_socket, 0, 6, (char *)&mreq, sizeof(mreq)) != SOCKET_ERROR) if (CRehldsPlatformHolder::get()->setsockopt(net_socket, 0, 6, (char *)&mreq, sizeof(mreq)) != SOCKET_ERROR)
{ {
#ifdef _WIN32 int err = NET_GetLastError();
int err = WSAGetLastError();
if (err != WSAEAFNOSUPPORT) if (err != WSAEAFNOSUPPORT)
#else
int err = errno;
if (err != EAFNOSUPPORT)
#endif // _WIN32
{ {
return FALSE; return FALSE;
} }

29
rehlds/engine/net_ws.h
View File

@ -39,28 +39,25 @@
#ifndef _WIN32 #ifndef _WIN32
#define WSAEWOULDBLOCK EWOULDBLOCK /* EAGAIN 11 */ #define WSAEWOULDBLOCK EWOULDBLOCK // Operation would block EAGAIN (11)
#define WSAEMSGSIZE EMSGSIZE /* 90 */ #define WSAEMSGSIZE EMSGSIZE // Message too long (90)
#define WSAEADDRNOTAVAIL EADDRNOTAVAIL /* 99 */ #define WSAEADDRNOTAVAIL EADDRNOTAVAIL // Cannot assign requested address (99)
#define WSAEAFNOSUPPORT EAFNOSUPPORT /* 97 */ #define WSAEAFNOSUPPORT EAFNOSUPPORT // Address family not supported by protocol (97)
#define WSAECONNRESET ECONNRESET /* 104 */ #define WSAECONNRESET ECONNRESET // Connection reset by peer (104)
#define WSAECONNREFUSED ECONNREFUSED /* 111 */ #define WSAECONNREFUSED ECONNREFUSED // Connection refused (111)
#define WSAEADDRINUSE EADDRINUSE /* 98 */ #define WSAEADDRINUSE EADDRINUSE // Address already in use (98)
#define WSAENOBUFS ENOBUFS /* 105 */ #define WSAENOBUFS ENOBUFS // No buffer space available (105)
#endif // _WIN32 #endif // _WIN32
#define MAX_ROUTEABLE_PACKET 1400 #define MAX_ROUTEABLE_PACKET 1400
//1400 - 9 = 1391
#define SPLIT_SIZE (MAX_ROUTEABLE_PACKET - sizeof(SPLITPACKET)) #define SPLIT_SIZE (MAX_ROUTEABLE_PACKET - sizeof(SPLITPACKET))
// Create general message queues // Create general message queues
#define NUM_MSG_QUEUES 40 #define NUM_MSG_QUEUES 40
#define MSG_QUEUE_SIZE 1536 #define MSG_QUEUE_SIZE 1536
/* <d297f> ../engine/net_ws.c:137 */
typedef struct loopmsg_s typedef struct loopmsg_s
{ {
unsigned char data[NET_MAX_MESSAGE]; unsigned char data[NET_MAX_MESSAGE];
@ -69,7 +66,6 @@ typedef struct loopmsg_s
#define MAX_LOOPBACK 4 #define MAX_LOOPBACK 4
/* <d29c2> ../engine/net_ws.c:143 */
typedef struct loopback_s typedef struct loopback_s
{ {
loopmsg_t msgs[MAX_LOOPBACK]; loopmsg_t msgs[MAX_LOOPBACK];
@ -77,7 +73,6 @@ typedef struct loopback_s
int send; int send;
} loopback_t; } loopback_t;
/* <d2a13> ../engine/net_ws.c:151 */
typedef struct packetlag_s typedef struct packetlag_s
{ {
unsigned char *pPacketData; // Raw stream data is stored. unsigned char *pPacketData; // Raw stream data is stored.
@ -88,7 +83,6 @@ typedef struct packetlag_s
struct packetlag_s *pPrev; struct packetlag_s *pPrev;
} packetlag_t; } packetlag_t;
/* <d2b2c> ../engine/net_ws.c:1118 */
typedef struct net_messages_s typedef struct net_messages_s
{ {
struct net_messages_s *next; struct net_messages_s *next;
@ -98,7 +92,6 @@ typedef struct net_messages_s
int buffersize; int buffersize;
} net_messages_t; } net_messages_t;
/* <d2a85> ../engine/net_ws.c:886 */
// Split long packets. Anything over 1460 is failing on some routers. // Split long packets. Anything over 1460 is failing on some routers.
typedef struct LONGPACKET_t typedef struct LONGPACKET_t
{ {
@ -109,7 +102,6 @@ typedef struct LONGPACKET_t
char buffer[MAX_UDP_PACKET]; // This has to be big enough to hold the largest message char buffer[MAX_UDP_PACKET]; // This has to be big enough to hold the largest message
} LONGPACKET; } LONGPACKET;
/* <d2ae9> ../engine/net_ws.c:900 */
// Use this to pick apart the network stream, must be packed // Use this to pick apart the network stream, must be packed
#pragma pack(push, 1) #pragma pack(push, 1)
typedef struct SPLITPACKET_t typedef struct SPLITPACKET_t
@ -120,7 +112,6 @@ typedef struct SPLITPACKET_t
} SPLITPACKET; } SPLITPACKET;
#pragma pack(pop) #pragma pack(pop)
#define NET_WS_MAX_FRAGMENTS 5 #define NET_WS_MAX_FRAGMENTS 5
#ifdef HOOK_ENGINE #ifdef HOOK_ENGINE
@ -227,10 +218,10 @@ extern net_messages_t *normalqueue;
void NET_ThreadLock(void); void NET_ThreadLock(void);
void NET_ThreadUnlock(void); void NET_ThreadUnlock(void);
short unsigned int Q_ntohs(short unsigned int netshort); unsigned short Q_ntohs(unsigned short netshort);
void NetadrToSockadr(const netadr_t *a, struct sockaddr *s); void NetadrToSockadr(const netadr_t *a, struct sockaddr *s);
void SockadrToNetadr(const struct sockaddr *s, netadr_t *a); void SockadrToNetadr(const struct sockaddr *s, netadr_t *a);
NOXREF short unsigned int NET_HostToNetShort(short unsigned int us_in); NOXREF unsigned short NET_HostToNetShort(unsigned short us_in);
qboolean NET_CompareAdr(netadr_t& a, netadr_t& b); qboolean NET_CompareAdr(netadr_t& a, netadr_t& b);
qboolean NET_CompareClassBAdr(netadr_t& a, netadr_t& b); qboolean NET_CompareClassBAdr(netadr_t& a, netadr_t& b);
qboolean NET_IsReservedAdr(netadr_t& a); qboolean NET_IsReservedAdr(netadr_t& a);

6
rehlds/engine/pmove.cpp
View File

@ -28,9 +28,6 @@
#include "precompiled.h" #include "precompiled.h"
playermove_t *pmove; playermove_t *pmove;
movevars_t movevars; movevars_t movevars;
@ -60,7 +57,6 @@ vec_t player_maxs[4][3]; // vec_t player_maxs[4][3];
#endif //HOOK_ENGINE #endif //HOOK_ENGINE
/* <69bcf> ../engine/pmove.c:36 */
qboolean PM_AddToTouched(pmtrace_t tr, vec_t *impactvelocity) qboolean PM_AddToTouched(pmtrace_t tr, vec_t *impactvelocity)
{ {
int i; int i;
@ -90,7 +86,6 @@ qboolean PM_AddToTouched(pmtrace_t tr, vec_t *impactvelocity)
return TRUE; return TRUE;
} }
/* <69b96> ../engine/pmove.c:63 */
void EXT_FUNC PM_StuckTouch(int hitent, pmtrace_t *ptraceresult) void EXT_FUNC PM_StuckTouch(int hitent, pmtrace_t *ptraceresult)
{ {
#ifdef REHLDS_CHECKS #ifdef REHLDS_CHECKS
@ -108,7 +103,6 @@ void EXT_FUNC PM_StuckTouch(int hitent, pmtrace_t *ptraceresult)
} }
} }
/* <69c7e> ../engine/pmove.c:79 */
void PM_Init(playermove_t *ppm) void PM_Init(playermove_t *ppm)
{ {
PM_InitBoxHull(); PM_InitBoxHull();

43
rehlds/engine/pmovetst.cpp
View File

@ -33,15 +33,13 @@ hull_t box_hull_0;
box_clipnodes_t box_clipnodes_0; box_clipnodes_t box_clipnodes_0;
box_planes_t box_planes_0; box_planes_t box_planes_0;
/* <6fbe5> ../engine/pmovetst.c:30 */
float EXT_FUNC PM_TraceModel(physent_t *pEnt, vec_t *start, vec_t *end, trace_t *trace) float EXT_FUNC PM_TraceModel(physent_t *pEnt, vec_t *start, vec_t *end, trace_t *trace)
{ {
hull_t *pHull; // 32 hull_t *pHull;
int saveHull; // 33 int saveHull;
vec3_t start_l; // 34 vec3_t start_l;
vec3_t end_l; // 34 vec3_t end_l;
vec3_t offset; // 34 vec3_t offset;
saveHull = pmove->usehull; saveHull = pmove->usehull;
pmove->usehull = 2; pmove->usehull = 2;
@ -58,7 +56,6 @@ float EXT_FUNC PM_TraceModel(physent_t *pEnt, vec_t *start, vec_t *end, trace_t
return trace->fraction; return trace->fraction;
} }
/* <6f286> ../engine/pmovetst.c:50 */
void EXT_FUNC PM_GetModelBounds(struct model_s *mod, vec_t *mins, vec_t *maxs) void EXT_FUNC PM_GetModelBounds(struct model_s *mod, vec_t *mins, vec_t *maxs)
{ {
mins[0] = mod->mins[0]; mins[0] = mod->mins[0];
@ -70,17 +67,13 @@ void EXT_FUNC PM_GetModelBounds(struct model_s *mod, vec_t *mins, vec_t *maxs)
maxs[2] = mod->maxs[2]; maxs[2] = mod->maxs[2];
} }
/* <6f2ca> ../engine/pmovetst.c:57 */
int EXT_FUNC PM_GetModelType(struct model_s *mod) int EXT_FUNC PM_GetModelType(struct model_s *mod)
{ {
return mod->type; return mod->type;
} }
/* <6f2f5> ../engine/pmovetst.c:70 */
void PM_InitBoxHull(void) void PM_InitBoxHull(void)
{ {
// int i; // 72
// int side; // 73
box_hull_0.clipnodes = &box_clipnodes_0[0]; box_hull_0.clipnodes = &box_clipnodes_0[0];
box_hull_0.planes = &box_planes_0[0]; box_hull_0.planes = &box_planes_0[0];
box_hull_0.firstclipnode = 0; box_hull_0.firstclipnode = 0;
@ -97,7 +90,6 @@ void PM_InitBoxHull(void)
} }
} }
/* <6f03c> ../engine/pmovetst.c:105 */
hull_t *PM_HullForBox(vec_t *mins, vec_t *maxs) hull_t *PM_HullForBox(vec_t *mins, vec_t *maxs)
{ {
box_planes_0[0].dist = maxs[0]; box_planes_0[0].dist = maxs[0];
@ -109,7 +101,6 @@ hull_t *PM_HullForBox(vec_t *mins, vec_t *maxs)
return &box_hull_0; return &box_hull_0;
} }
/* <6f34f> ../engine/pmovetst.c:124 */
int EXT_FUNC PM_HullPointContents(hull_t *hull, int num, vec_t *p) int EXT_FUNC PM_HullPointContents(hull_t *hull, int num, vec_t *p)
{ {
float d; float d;
@ -140,7 +131,6 @@ int EXT_FUNC PM_HullPointContents(hull_t *hull, int num, vec_t *p)
return num; return num;
} }
/* <6f6b2> ../engine/pmovetst.c:171 */
int PM_LinkContents(vec_t *p, int *pIndex) int PM_LinkContents(vec_t *p, int *pIndex)
{ {
physent_t *pe; physent_t *pe;
@ -165,7 +155,6 @@ int PM_LinkContents(vec_t *p, int *pIndex)
return -1; return -1;
} }
/* <6f740> ../engine/pmovetst.c:223 */
int EXT_FUNC PM_PointContents(vec_t *p, int *truecontents) int EXT_FUNC PM_PointContents(vec_t *p, int *truecontents)
{ {
#ifndef SWDS #ifndef SWDS
@ -199,7 +188,6 @@ int EXT_FUNC PM_PointContents(vec_t *p, int *truecontents)
return -2; return -2;
} }
/* <6f7b0> ../engine/pmovetst.c:265 */
int PM_WaterEntity(vec_t *p) int PM_WaterEntity(vec_t *p)
{ {
int cont; int cont;
@ -219,7 +207,6 @@ int PM_WaterEntity(vec_t *p)
return PM_LinkContents(p, &entityIndex); return PM_LinkContents(p, &entityIndex);
} }
/* <6f813> ../engine/pmovetst.c:299 */
int EXT_FUNC PM_TruePointContents(vec_t *p) int EXT_FUNC PM_TruePointContents(vec_t *p)
{ {
if ((int)pmove->physents[0].model == -208) if ((int)pmove->physents[0].model == -208)
@ -228,10 +215,9 @@ int EXT_FUNC PM_TruePointContents(vec_t *p)
return PM_HullPointContents(pmove->physents[0].model->hulls, pmove->physents[0].model->hulls[0].firstclipnode, p); return PM_HullPointContents(pmove->physents[0].model->hulls, pmove->physents[0].model->hulls[0].firstclipnode, p);
} }
/* <6f84f> ../engine/pmovetst.c:324 */
hull_t *PM_HullForStudioModel(model_t *pModel, vec_t *offset, float frame, int sequence, const vec_t *angles, const vec_t *origin, const unsigned char *pcontroller, const unsigned char *pblending, int *pNumHulls) hull_t *PM_HullForStudioModel(model_t *pModel, vec_t *offset, float frame, int sequence, const vec_t *angles, const vec_t *origin, const unsigned char *pcontroller, const unsigned char *pblending, int *pNumHulls)
{ {
vec3_t size; // 335 vec3_t size;
size[0] = player_maxs[pmove->usehull][0] - player_mins[pmove->usehull][0]; size[0] = player_maxs[pmove->usehull][0] - player_mins[pmove->usehull][0];
size[1] = player_maxs[pmove->usehull][1] - player_mins[pmove->usehull][1]; size[1] = player_maxs[pmove->usehull][1] - player_mins[pmove->usehull][1];
@ -243,7 +229,6 @@ hull_t *PM_HullForStudioModel(model_t *pModel, vec_t *offset, float frame, int s
return R_StudioHull(pModel, frame, sequence, angles, origin, size, pcontroller, pblending, pNumHulls, 0, 0); return R_StudioHull(pModel, frame, sequence, angles, origin, size, pcontroller, pblending, pNumHulls, 0, 0);
} }
/* <6fb99> ../engine/pmovetst.c:343 */
hull_t* EXT_FUNC PM_HullForBsp(physent_t *pe, vec_t *offset) hull_t* EXT_FUNC PM_HullForBsp(physent_t *pe, vec_t *offset)
{ {
hull_t *hull; hull_t *hull;
@ -275,7 +260,6 @@ hull_t* EXT_FUNC PM_HullForBsp(physent_t *pe, vec_t *offset)
return hull; return hull;
} }
/* <6fc84> ../engine/pmovetst.c:381 */
int _PM_TestPlayerPosition(vec_t *pos, pmtrace_t *ptrace, int(*pfnIgnore)(physent_t *)) int _PM_TestPlayerPosition(vec_t *pos, pmtrace_t *ptrace, int(*pfnIgnore)(physent_t *))
{ {
hull_t *hull; hull_t *hull;
@ -300,7 +284,7 @@ int _PM_TestPlayerPosition(vec_t *pos, pmtrace_t *ptrace, int(*pfnIgnore)(physen
offset[1] = pe->origin[1]; offset[1] = pe->origin[1];
offset[2] = pe->origin[2]; offset[2] = pe->origin[2];
numhulls = 1; numhulls = 1;
if (pe->model) if (pe->model)
{ {
hull = PM_HullForBsp(pe, offset); hull = PM_HullForBsp(pe, offset);
@ -356,19 +340,16 @@ int _PM_TestPlayerPosition(vec_t *pos, pmtrace_t *ptrace, int(*pfnIgnore)(physen
} }
/* <6fe2a> ../engine/pmovetst.c:507 */
int EXT_FUNC PM_TestPlayerPosition(vec_t *pos, pmtrace_t *ptrace) int EXT_FUNC PM_TestPlayerPosition(vec_t *pos, pmtrace_t *ptrace)
{ {
return _PM_TestPlayerPosition(pos, ptrace, 0); return _PM_TestPlayerPosition(pos, ptrace, 0);
} }
/* <6fe67> ../engine/pmovetst.c:518 */
int EXT_FUNC PM_TestPlayerPositionEx(vec_t *pos, pmtrace_t *ptrace, int(*pfnIgnore)(physent_t *)) int EXT_FUNC PM_TestPlayerPositionEx(vec_t *pos, pmtrace_t *ptrace, int(*pfnIgnore)(physent_t *))
{ {
return _PM_TestPlayerPosition(pos, ptrace, pfnIgnore); return _PM_TestPlayerPosition(pos, ptrace, pfnIgnore);
} }
/* <6f065> ../engine/pmovetst.c:534 */
pmtrace_t _PM_PlayerTrace(vec_t *start, vec_t *end, int traceFlags, int numphysent, physent_t *physents, int ignore_pe, int(*pfnIgnore)(physent_t *)) pmtrace_t _PM_PlayerTrace(vec_t *start, vec_t *end, int traceFlags, int numphysent, physent_t *physents, int ignore_pe, int(*pfnIgnore)(physent_t *))
{ {
hull_t *hull; hull_t *hull;
@ -571,14 +552,12 @@ pmtrace_t _PM_PlayerTrace(vec_t *start, vec_t *end, int traceFlags, int numphyse
return trace; return trace;
} }
/* <6f237> ../engine/pmovetst.c:787 */
pmtrace_t EXT_FUNC PM_PlayerTrace(vec_t *start, vec_t *end, int traceFlags, int ignore_pe) pmtrace_t EXT_FUNC PM_PlayerTrace(vec_t *start, vec_t *end, int traceFlags, int ignore_pe)
{ {
pmtrace_t tr = _PM_PlayerTrace(start, end, traceFlags, pmove->numphysent, pmove->physents, ignore_pe, NULL); pmtrace_t tr = _PM_PlayerTrace(start, end, traceFlags, pmove->numphysent, pmove->physents, ignore_pe, NULL);
return tr; return tr;
} }
/* <6f1e8> ../engine/pmovetst.c:794 */
pmtrace_t EXT_FUNC PM_PlayerTraceEx(vec_t *start, vec_t *end, int traceFlags, int(*pfnIgnore)(physent_t *)) pmtrace_t EXT_FUNC PM_PlayerTraceEx(vec_t *start, vec_t *end, int traceFlags, int(*pfnIgnore)(physent_t *))
{ {
pmtrace_t tr = _PM_PlayerTrace(start, end, traceFlags, pmove->numphysent, pmove->physents, -1, pfnIgnore); pmtrace_t tr = _PM_PlayerTrace(start, end, traceFlags, pmove->numphysent, pmove->physents, -1, pfnIgnore);
@ -609,17 +588,16 @@ struct pmtrace_s* EXT_FUNC PM_TraceLine(float *start, float *end, int flags, int
return &tr; return &tr;
} }
/* <70238> ../engine/pmovetst.c:824 */
struct pmtrace_s* EXT_FUNC PM_TraceLineEx(float *start, float *end, int flags, int usehull, int(*pfnIgnore)(physent_t *)) struct pmtrace_s* EXT_FUNC PM_TraceLineEx(float *start, float *end, int flags, int usehull, int(*pfnIgnore)(physent_t *))
{ {
int oldhull; // 826 int oldhull;
static pmtrace_t tr; // 827 static pmtrace_t tr;
oldhull = pmove->usehull; oldhull = pmove->usehull;
pmove->usehull = usehull; pmove->usehull = usehull;
if (flags) if (flags)
{ {
tr = _PM_PlayerTrace(start, end, PM_NORMAL, pmove->numvisent, pmove->visents, -1, pfnIgnore); tr = _PM_PlayerTrace(start, end, PM_NORMAL, pmove->numvisent, pmove->visents, -1, pfnIgnore);
} }
else else
{ {
@ -630,7 +608,6 @@ struct pmtrace_s* EXT_FUNC PM_TraceLineEx(float *start, float *end, int flags, i
} }
#ifndef REHLDS_OPT_PEDANTIC #ifndef REHLDS_OPT_PEDANTIC
/* <6ef4a> ../engine/pmovetst.c:844 */
qboolean PM_RecursiveHullCheck(hull_t *hull, int num, float p1f, float p2f, const vec_t *p1, const vec_t *p2, pmtrace_t *trace) qboolean PM_RecursiveHullCheck(hull_t *hull, int num, float p1f, float p2f, const vec_t *p1, const vec_t *p2, pmtrace_t *trace)
{ {
dclipnode_t *node; dclipnode_t *node;

224
rehlds/engine/pr_cmds.cpp
View File

File diff suppressed because it is too large Load Diff

14
rehlds/engine/pr_cmds.h
View File

@ -143,12 +143,12 @@ edict_t *FindEntityByString(edict_t *pEdictStartSearchAfter, const char *pszFiel
int GetEntityIllum(edict_t *pEnt); int GetEntityIllum(edict_t *pEnt);
qboolean PR_IsEmptyString(const char *s); qboolean PR_IsEmptyString(const char *s);
int PF_precache_sound_I(const char *s); int PF_precache_sound_I(const char *s);
short unsigned int EV_Precache(int type, const char *psz); unsigned short EV_Precache(int type, const char *psz);
void EV_PlayReliableEvent_api(IGameClient *cl, int entindex, short unsigned int eventindex, float delay, event_args_t *pargs); void EV_PlayReliableEvent_api(IGameClient *cl, int entindex, unsigned short eventindex, float delay, event_args_t *pargs);
void EV_PlayReliableEvent(client_t *cl, int entindex, short unsigned int eventindex, float delay, event_args_t *pargs); void EV_PlayReliableEvent(client_t *cl, int entindex, unsigned short eventindex, float delay, event_args_t *pargs);
void EV_PlayReliableEvent_internal(client_t *cl, int entindex, short unsigned int eventindex, float delay, event_args_t *pargs); void EV_PlayReliableEvent_internal(client_t *cl, int entindex, unsigned short eventindex, float delay, event_args_t *pargs);
void EV_Playback(int flags, const edict_t *pInvoker, short unsigned int eventindex, float delay, float *origin, float *angles, float fparam1, float fparam2, int iparam1, int iparam2, int bparam1, int bparam2); void EV_Playback(int flags, const edict_t *pInvoker, unsigned short eventindex, float delay, float *origin, float *angles, float fparam1, float fparam2, int iparam1, int iparam2, int bparam1, int bparam2);
void EV_SV_Playback(int flags, int clientindex, short unsigned int eventindex, float delay, float *origin, float *angles, float fparam1, float fparam2, int iparam1, int iparam2, int bparam1, int bparam2); void EV_SV_Playback(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);
int PF_precache_model_I(const char *s); int PF_precache_model_I(const char *s);
int PF_precache_generic_I(char *s); int PF_precache_generic_I(char *s);
int PF_IsMapValid_I(char *mapname); int PF_IsMapValid_I(char *mapname);
@ -170,7 +170,7 @@ void PF_changepitch_I(edict_t *ent);
void PF_setview_I(const edict_t *clientent, const edict_t *viewent); void PF_setview_I(const edict_t *clientent, const edict_t *viewent);
void PF_crosshairangle_I(const edict_t *clientent, float pitch, float yaw); void PF_crosshairangle_I(const edict_t *clientent, float pitch, float yaw);
edict_t *PF_CreateFakeClient_I(const char *netname); edict_t *PF_CreateFakeClient_I(const char *netname);
void PF_RunPlayerMove_I(edict_t *fakeclient, const float *viewangles, float forwardmove, float sidemove, float upmove, short unsigned int buttons, unsigned char impulse, unsigned char msec); void PF_RunPlayerMove_I(edict_t *fakeclient, const float *viewangles, float forwardmove, float sidemove, float upmove, unsigned short buttons, unsigned char impulse, unsigned char msec);
sizebuf_t *WriteDest_Parm(int dest); sizebuf_t *WriteDest_Parm(int dest);
void PF_MessageBegin_I(int msg_dest, int msg_type, const float *pOrigin, edict_t *ed); void PF_MessageBegin_I(int msg_dest, int msg_type, const float *pOrigin, edict_t *ed);
void PF_MessageEnd_I(void); void PF_MessageEnd_I(void);

7
rehlds/engine/pr_dlls.h
View File

@ -35,16 +35,12 @@
#include "maintypes.h" #include "maintypes.h"
#include "eiface.h" #include "eiface.h"
/* <8a763> ../engine/pr_dlls.h:42 */
typedef struct functiontable_s typedef struct functiontable_s
{ {
uint32 pFunction; uint32 pFunction;
char *pFunctionName; char *pFunctionName;
} functiontable_t; } functiontable_t;
/* 572 */
/* <8a793> ../engine/pr_dlls.h:48 */
typedef struct extensiondll_s typedef struct extensiondll_s
{ {
void *lDLLHandle; void *lDLLHandle;
@ -52,11 +48,8 @@ typedef struct extensiondll_s
int functionCount; int functionCount;
} extensiondll_t; } extensiondll_t;
/* <8a7db> ../engine/pr_dlls.h:63 */
typedef void(*ENTITYINIT)(struct entvars_s *); typedef void(*ENTITYINIT)(struct entvars_s *);
/* <8a7f8> ../engine/pr_dlls.h:64 */
typedef void(*DISPATCHFUNCTION)(struct entvars_s *, void *); typedef void(*DISPATCHFUNCTION)(struct entvars_s *, void *);
/* <8a81a> ../engine/pr_dlls.h:65 */
typedef void(*FIELDIOFUNCTION)(SAVERESTOREDATA *, const char *, void *, TYPEDESCRIPTION *, int); typedef void(*FIELDIOFUNCTION)(SAVERESTOREDATA *, const char *, void *, TYPEDESCRIPTION *, int);
#endif // PR_DLLS_H #endif // PR_DLLS_H

54
rehlds/engine/pr_edict.cpp
View File

@ -28,8 +28,6 @@
#include "precompiled.h" #include "precompiled.h"
/* <7f360> ../engine/pr_edict.c:37 */
void ED_ClearEdict(edict_t *e) void ED_ClearEdict(edict_t *e)
{ {
Q_memset(&e->v, 0, sizeof(e->v)); Q_memset(&e->v, 0, sizeof(e->v));
@ -38,7 +36,6 @@ void ED_ClearEdict(edict_t *e)
InitEntityDLLFields(e); InitEntityDLLFields(e);
} }
/* <7f3cb> ../engine/pr_edict.c:57 */
edict_t *ED_Alloc(void) edict_t *ED_Alloc(void)
{ {
int i; int i;
@ -73,7 +70,6 @@ edict_t *ED_Alloc(void)
return e; return e;
} }
/* <7f310> ../engine/pr_edict.c:96 */
void ED_Free(edict_t *ed) void ED_Free(edict_t *ed)
{ {
if (!ed->free) if (!ed->free)
@ -105,7 +101,6 @@ void ED_Free(edict_t *ed)
} }
} }
/* <7f4f6> ../engine/pr_edict.c:170 */
NOXREF void ED_Count(void) NOXREF void ED_Count(void)
{ {
NOXREFCHECK; NOXREFCHECK;
@ -133,18 +128,17 @@ NOXREF void ED_Count(void)
Con_Printf("step :%3i\n", step); Con_Printf("step :%3i\n", step);
} }
/* <7f568> ../engine/pr_edict.c:205 */
char *ED_NewString(const char *string) char *ED_NewString(const char *string)
{ {
char *new_s; char *new_s;
//Engine string pooling // Engine string pooling
#ifdef REHLDS_FIXES #ifdef REHLDS_FIXES
//escaping is done inside Ed_StrPool_Alloc() // escaping is done inside Ed_StrPool_Alloc()
new_s = Ed_StrPool_Alloc(string); new_s = Ed_StrPool_Alloc(string);
#else //REHLDS_FIXES #else // REHLDS_FIXES
int l = Q_strlen(string); int l = Q_strlen(string);
new_s = (char *)Hunk_Alloc(l + 1); new_s = (char *)Hunk_Alloc(l + 1);
@ -167,12 +161,11 @@ char *ED_NewString(const char *string)
} }
*new_p = 0; *new_p = 0;
#endif //REHLDS_FIXES #endif // REHLDS_FIXES
return new_s; return new_s;
} }
/* <7f5ee> ../engine/pr_edict.c:245 */
char *ED_ParseEdict(char *data, edict_t *ent) char *ED_ParseEdict(char *data, edict_t *ent)
{ {
qboolean init = FALSE; qboolean init = FALSE;
@ -289,7 +282,6 @@ char *ED_ParseEdict(char *data, edict_t *ent)
return data; return data;
} }
/* <7f6ee> ../engine/pr_edict.c:402 */
void ED_LoadFromFile(char *data) void ED_LoadFromFile(char *data)
{ {
edict_t *ent; edict_t *ent;
@ -352,13 +344,11 @@ void ED_LoadFromFile(char *data)
Con_DPrintf("%i entities inhibited\n", inhibit); Con_DPrintf("%i entities inhibited\n", inhibit);
} }
/* <7f7fa> ../engine/pr_edict.c:484 */
NOXREF void PR_Init(void) NOXREF void PR_Init(void)
{ {
NOXREFCHECK; NOXREFCHECK;
} }
/* <7f80f> ../engine/pr_edict.c:495 */
edict_t *EDICT_NUM(int n) edict_t *EDICT_NUM(int n)
{ {
if (n < 0 || n >= g_psv.max_edicts) if (n < 0 || n >= g_psv.max_edicts)
@ -368,7 +358,6 @@ edict_t *EDICT_NUM(int n)
return &g_psv.edicts[n]; return &g_psv.edicts[n];
} }
/* <7f84b> ../engine/pr_edict.c:511 */
int NUM_FOR_EDICT(const edict_t *e) int NUM_FOR_EDICT(const edict_t *e)
{ {
int b; int b;
@ -382,7 +371,6 @@ int NUM_FOR_EDICT(const edict_t *e)
return b; return b;
} }
/* <7f280> ../engine/pr_edict.c:539 */
bool SuckOutClassname(char *szInputStream, edict_t *pEdict) bool SuckOutClassname(char *szInputStream, edict_t *pEdict)
{ {
char szKeyName[256]; char szKeyName[256];
@ -447,19 +435,16 @@ bool SuckOutClassname(char *szInputStream, edict_t *pEdict)
return false; return false;
} }
/* <7f89a> ../engine/pr_edict.c:579 */
void ReleaseEntityDLLFields(edict_t *pEdict) void ReleaseEntityDLLFields(edict_t *pEdict)
{ {
FreeEntPrivateData(pEdict); FreeEntPrivateData(pEdict);
} }
/* <7f264> ../engine/pr_edict.c:584 */
void InitEntityDLLFields(edict_t *pEdict) void InitEntityDLLFields(edict_t *pEdict)
{ {
pEdict->v.pContainingEntity = pEdict; pEdict->v.pContainingEntity = pEdict;
} }
/* <7f8ee> ../engine/pr_edict.c:594 */
void* EXT_FUNC PvAllocEntPrivateData(edict_t *pEdict, int32 cb) void* EXT_FUNC PvAllocEntPrivateData(edict_t *pEdict, int32 cb)
{ {
FreeEntPrivateData(pEdict); FreeEntPrivateData(pEdict);
@ -475,12 +460,11 @@ void* EXT_FUNC PvAllocEntPrivateData(edict_t *pEdict, int32 cb)
if (rehlds_flrec_pvdata.string[0] != '0') { if (rehlds_flrec_pvdata.string[0] != '0') {
FR_AllocEntPrivateData(pEdict->pvPrivateData, cb); FR_AllocEntPrivateData(pEdict->pvPrivateData, cb);
} }
#endif //REHLDS_FLIGHT_REC #endif // REHLDS_FLIGHT_REC
return pEdict->pvPrivateData; return pEdict->pvPrivateData;
} }
/* <7f943> ../engine/pr_edict.c:607 */
void* EXT_FUNC PvEntPrivateData(edict_t *pEdict) void* EXT_FUNC PvEntPrivateData(edict_t *pEdict)
{ {
if (!pEdict) if (!pEdict)
@ -491,7 +475,6 @@ void* EXT_FUNC PvEntPrivateData(edict_t *pEdict)
return pEdict->pvPrivateData; return pEdict->pvPrivateData;
} }
/* <7f2f4> ../engine/pr_edict.c:618 */
void FreeEntPrivateData(edict_t *pEdict) void FreeEntPrivateData(edict_t *pEdict)
{ {
if (pEdict->pvPrivateData) if (pEdict->pvPrivateData)
@ -505,14 +488,13 @@ void FreeEntPrivateData(edict_t *pEdict)
if (rehlds_flrec_pvdata.string[0] != '0') { if (rehlds_flrec_pvdata.string[0] != '0') {
FR_FreeEntPrivateData(pEdict->pvPrivateData); FR_FreeEntPrivateData(pEdict->pvPrivateData);
} }
#endif //REHLDS_FLIGHT_REC #endif // REHLDS_FLIGHT_REC
Mem_Free(pEdict->pvPrivateData); Mem_Free(pEdict->pvPrivateData);
pEdict->pvPrivateData = 0; pEdict->pvPrivateData = 0;
} }
} }
/* <7f98e> ../engine/pr_edict.c:647 */
void FreeAllEntPrivateData(void) void FreeAllEntPrivateData(void)
{ {
for (int i = 0; i < g_psv.num_edicts; i++) for (int i = 0; i < g_psv.num_edicts; i++)
@ -521,19 +503,16 @@ void FreeAllEntPrivateData(void)
} }
} }
/* <7f9d0> ../engine/pr_edict.c:660 */
edict_t* EXT_FUNC PEntityOfEntOffset(int iEntOffset) edict_t* EXT_FUNC PEntityOfEntOffset(int iEntOffset)
{ {
return (edict_t *)((char *)g_psv.edicts + iEntOffset); return (edict_t *)((char *)g_psv.edicts + iEntOffset);
} }
/* <7f9fd> ../engine/pr_edict.c:665 */
int EXT_FUNC EntOffsetOfPEntity(const edict_t *pEdict) int EXT_FUNC EntOffsetOfPEntity(const edict_t *pEdict)
{ {
return (char *)pEdict - (char *)g_psv.edicts; return (char *)pEdict - (char *)g_psv.edicts;
} }
/* <7fa2a> ../engine/pr_edict.c:670 */
int EXT_FUNC IndexOfEdict(const edict_t *pEdict) int EXT_FUNC IndexOfEdict(const edict_t *pEdict)
{ {
int index = 0; int index = 0;
@ -541,7 +520,7 @@ int EXT_FUNC IndexOfEdict(const edict_t *pEdict)
{ {
index = pEdict - g_psv.edicts; index = pEdict - g_psv.edicts;
#ifdef REHLDS_FIXES #ifdef REHLDS_FIXES
if (index < 0 || index >= g_psv.max_edicts) //max_edicts is not valid entity index if (index < 0 || index >= g_psv.max_edicts) // max_edicts is not valid entity index
#else // REHLDS_FIXES #else // REHLDS_FIXES
if (index < 0 || index > g_psv.max_edicts) if (index < 0 || index > g_psv.max_edicts)
#endif // REHLDS_FIXES #endif // REHLDS_FIXES
@ -552,7 +531,6 @@ int EXT_FUNC IndexOfEdict(const edict_t *pEdict)
return index; return index;
} }
/* <7fa68> ../engine/pr_edict.c:691 */
edict_t* EXT_FUNC PEntityOfEntIndex(int iEntIndex) edict_t* EXT_FUNC PEntityOfEntIndex(int iEntIndex)
{ {
if (iEntIndex < 0 || iEntIndex >= g_psv.max_edicts) if (iEntIndex < 0 || iEntIndex >= g_psv.max_edicts)
@ -563,7 +541,7 @@ edict_t* EXT_FUNC PEntityOfEntIndex(int iEntIndex)
edict_t *pEdict = EDICT_NUM(iEntIndex); edict_t *pEdict = EDICT_NUM(iEntIndex);
#ifdef REHLDS_FIXES #ifdef REHLDS_FIXES
if (pEdict && (pEdict->free || (iEntIndex > g_psvs.maxclients && !pEdict->pvPrivateData))) //Simplified confition if (pEdict && (pEdict->free || (iEntIndex > g_psvs.maxclients && !pEdict->pvPrivateData))) // Simplified confition
{ {
return NULL; return NULL;
} }
@ -580,19 +558,16 @@ edict_t* EXT_FUNC PEntityOfEntIndex(int iEntIndex)
return pEdict; return pEdict;
} }
/* <7fac3> ../engine/pr_edict.c:711 */
const char* EXT_FUNC SzFromIndex(int iString) const char* EXT_FUNC SzFromIndex(int iString)
{ {
return (const char *)(pr_strings + iString); return (const char *)(pr_strings + iString);
} }
/* <7faf0> ../engine/pr_edict.c:721 */
entvars_t* EXT_FUNC GetVarsOfEnt(edict_t *pEdict) entvars_t* EXT_FUNC GetVarsOfEnt(edict_t *pEdict)
{ {
return &pEdict->v; return &pEdict->v;
} }
/* <7fb23> ../engine/pr_edict.c:731 */
edict_t* EXT_FUNC FindEntityByVars(entvars_t *pvars) edict_t* EXT_FUNC FindEntityByVars(entvars_t *pvars)
{ {
for (int i = 0; i < g_psv.num_edicts; i++) for (int i = 0; i < g_psv.num_edicts; i++)
@ -606,37 +581,31 @@ edict_t* EXT_FUNC FindEntityByVars(entvars_t *pvars)
return NULL; return NULL;
} }
/* <7fb75> ../engine/pr_edict.c:747 */
float EXT_FUNC CVarGetFloat(const char *szVarName) float EXT_FUNC CVarGetFloat(const char *szVarName)
{ {
return Cvar_VariableValue(szVarName); return Cvar_VariableValue(szVarName);
} }
/* <7fba2> ../engine/pr_edict.c:753 */
const char* EXT_FUNC CVarGetString(const char *szVarName) const char* EXT_FUNC CVarGetString(const char *szVarName)
{ {
return Cvar_VariableString(szVarName); return Cvar_VariableString(szVarName);
} }
/* <7fbcf> ../engine/pr_edict.c:759 */
cvar_t* EXT_FUNC CVarGetPointer(const char *szVarName) cvar_t* EXT_FUNC CVarGetPointer(const char *szVarName)
{ {
return Cvar_FindVar(szVarName); return Cvar_FindVar(szVarName);
} }
/* <7fbfc> ../engine/pr_edict.c:765 */
void EXT_FUNC CVarSetFloat(const char *szVarName, float flValue) void EXT_FUNC CVarSetFloat(const char *szVarName, float flValue)
{ {
Cvar_SetValue(szVarName, flValue); Cvar_SetValue(szVarName, flValue);
} }
/* <7fc34> ../engine/pr_edict.c:771 */
void EXT_FUNC CVarSetString(const char *szVarName, const char *szValue) void EXT_FUNC CVarSetString(const char *szVarName, const char *szValue)
{ {
Cvar_Set(szVarName, szValue); Cvar_Set(szVarName, szValue);
} }
/* <7fc6c> ../engine/pr_edict.c:777 */
void EXT_FUNC CVarRegister(cvar_t *pCvar) void EXT_FUNC CVarRegister(cvar_t *pCvar)
{ {
if (pCvar) if (pCvar)
@ -646,13 +615,11 @@ void EXT_FUNC CVarRegister(cvar_t *pCvar)
} }
} }
/* <7fc95> ../engine/pr_edict.c:794 */
int EXT_FUNC AllocEngineString(const char *szValue) int EXT_FUNC AllocEngineString(const char *szValue)
{ {
return ED_NewString(szValue) - pr_strings; return ED_NewString(szValue) - pr_strings;
} }
/* <7fd06> ../engine/pr_edict.c:802 */
void EXT_FUNC SaveSpawnParms(edict_t *pEdict) void EXT_FUNC SaveSpawnParms(edict_t *pEdict)
{ {
int eoffset = NUM_FOR_EDICT(pEdict); int eoffset = NUM_FOR_EDICT(pEdict);
@ -663,7 +630,6 @@ void EXT_FUNC SaveSpawnParms(edict_t *pEdict)
// Nothing more for this function even on client-side // Nothing more for this function even on client-side
} }
/* <7fd78> ../engine/pr_edict.c:815 */
void* EXT_FUNC GetModelPtr(edict_t *pEdict) void* EXT_FUNC GetModelPtr(edict_t *pEdict)
{ {
if (!pEdict) if (!pEdict)

52
rehlds/engine/r_studio.cpp
View File

@ -28,8 +28,6 @@
#include "precompiled.h" #include "precompiled.h"
/* <82eb2> ../engine/r_studio.c:108 */
typedef struct r_studiocache_s typedef struct r_studiocache_s
{ {
float frame; float frame;
@ -45,7 +43,6 @@ typedef struct r_studiocache_s
int numhulls; int numhulls;
} r_studiocache_t; } r_studiocache_t;
studiohdr_t *pstudiohdr; studiohdr_t *pstudiohdr;
//auxvert_t auxverts[2048]; //auxvert_t auxverts[2048];
@ -78,17 +75,15 @@ sv_blending_interface_t svBlending = { 1, SV_StudioSetupBones };
sv_blending_interface_t *g_pSvBlendingAPI = &svBlending; sv_blending_interface_t *g_pSvBlendingAPI = &svBlending;
server_studio_api_t server_studio_api = { Mem_Calloc, Cache_Check, COM_LoadCacheFile, Mod_Extradata }; server_studio_api_t server_studio_api = { Mem_Calloc, Cache_Check, COM_LoadCacheFile, Mod_Extradata };
#else //HOOK_ENGINE #else // HOOK_ENGINE
cvar_t r_cachestudio; cvar_t r_cachestudio;
sv_blending_interface_t svBlending; sv_blending_interface_t svBlending;
sv_blending_interface_t *g_pSvBlendingAPI; sv_blending_interface_t *g_pSvBlendingAPI;
server_studio_api_t server_studio_api; server_studio_api_t server_studio_api;
#endif // HOOK_ENGINE
#endif //HOOK_ENGINE
/* <83117> ../engine/r_studio.c:190 */
void SV_InitStudioHull(void) void SV_InitStudioHull(void)
{ {
if (studio_hull[0].planes == NULL) if (studio_hull[0].planes == NULL)
@ -111,7 +106,6 @@ void SV_InitStudioHull(void)
} }
} }
/* <83160> ../engine/r_studio.c:227 */
r_studiocache_t *R_CheckStudioCache(model_t *pModel, float frame, int sequence, const vec_t *angles, const vec_t *origin, const vec_t *size, const unsigned char *controller, const unsigned char *blending) r_studiocache_t *R_CheckStudioCache(model_t *pModel, float frame, int sequence, const vec_t *angles, const vec_t *origin, const vec_t *size, const unsigned char *controller, const unsigned char *blending)
{ {
for (int i = 0; i < STUDIO_CACHE_SIZE; i++) for (int i = 0; i < STUDIO_CACHE_SIZE; i++)
@ -132,7 +126,6 @@ r_studiocache_t *R_CheckStudioCache(model_t *pModel, float frame, int sequence,
return NULL; return NULL;
} }
/* <83215> ../engine/r_studio.c:275 */
NOXREF void R_AddToStudioCache(float frame, int sequence, const vec_t *angles, const vec_t *origin, const vec_t *size, const unsigned char *controller, const unsigned char *pblending, model_t *pModel, hull_t *pHulls, int numhulls) NOXREF void R_AddToStudioCache(float frame, int sequence, const vec_t *angles, const vec_t *origin, const vec_t *size, const unsigned char *controller, const unsigned char *pblending, model_t *pModel, hull_t *pHulls, int numhulls)
{ {
r_studiocache_t *p; r_studiocache_t *p;
@ -175,7 +168,6 @@ NOXREF void R_AddToStudioCache(float frame, int sequence, const vec_t *angles, c
nCurrentPlane += 6 * numhulls; nCurrentPlane += 6 * numhulls;
} }
/* <832a5> ../engine/r_studio.c:317 */
void AngleQuaternion(vec_t *angles, vec_t *quaternion) void AngleQuaternion(vec_t *angles, vec_t *quaternion)
{ {
float angle; float angle;
@ -198,7 +190,6 @@ void AngleQuaternion(vec_t *angles, vec_t *quaternion)
quaternion[3] = cr*cp*cy + sr*sp*sy; // W quaternion[3] = cr*cp*cy + sr*sp*sy; // W
} }
/* <83344> ../engine/r_studio.c:340 */
void QuaternionSlerp(vec_t *p, vec_t *q, float t, vec_t *qt) void QuaternionSlerp(vec_t *p, vec_t *q, float t, vec_t *qt)
{ {
int i; int i;
@ -256,7 +247,6 @@ void QuaternionSlerp(vec_t *p, vec_t *q, float t, vec_t *qt)
} }
} }
/* <833be> ../engine/r_studio.c:387 */
void QuaternionMatrix(vec_t *quaternion, float matrix[3][4]) void QuaternionMatrix(vec_t *quaternion, float matrix[3][4])
{ {
matrix[0][0] = 1.0f - 2.0f * quaternion[1] * quaternion[1] - 2.0f * quaternion[2] * quaternion[2]; matrix[0][0] = 1.0f - 2.0f * quaternion[1] * quaternion[1] - 2.0f * quaternion[2] * quaternion[2];
@ -272,7 +262,6 @@ void QuaternionMatrix(vec_t *quaternion, float matrix[3][4])
matrix[2][2] = 1.0f - 2.0f * quaternion[0] * quaternion[0] - 2.0f * quaternion[1] * quaternion[1]; matrix[2][2] = 1.0f - 2.0f * quaternion[0] * quaternion[0] - 2.0f * quaternion[1] * quaternion[1];
} }
/* <8340d> ../engine/r_studio.c:436 */
void R_StudioCalcBoneAdj(float dadt, float *adj, const unsigned char *pcontroller1, const unsigned char *pcontroller2, unsigned char mouthopen) void R_StudioCalcBoneAdj(float dadt, float *adj, const unsigned char *pcontroller1, const unsigned char *pcontroller2, unsigned char mouthopen)
{ {
int i, j; int i, j;
@ -333,7 +322,6 @@ void R_StudioCalcBoneAdj(float dadt, float *adj, const unsigned char *pcontrolle
} }
} }
/* <83487> ../engine/r_studio.c:497 */
void R_StudioCalcBoneQuaterion(int frame, float s, mstudiobone_t *pbone, mstudioanim_t *panim, float *adj, float *q) void R_StudioCalcBoneQuaterion(int frame, float s, mstudiobone_t *pbone, mstudioanim_t *panim, float *adj, float *q)
{ {
int j, k; int j, k;
@ -408,7 +396,6 @@ void R_StudioCalcBoneQuaterion(int frame, float s, mstudiobone_t *pbone, mstudio
} }
} }
/* <83572> ../engine/r_studio.c:577 */
void R_StudioCalcBonePosition(int frame, float s, mstudiobone_t *pbone, mstudioanim_t *panim, float *adj, float *pos) void R_StudioCalcBonePosition(int frame, float s, mstudiobone_t *pbone, mstudioanim_t *panim, float *adj, float *pos)
{ {
int j, k; int j, k;
@ -477,7 +464,6 @@ void R_StudioCalcBonePosition(int frame, float s, mstudiobone_t *pbone, mstudioa
} }
} }
/* <830a3> ../engine/r_studio.c:639 */
void R_StudioSlerpBones(vec4_t *q1, vec3_t *pos1, vec4_t *q2, vec3_t *pos2, float s) void R_StudioSlerpBones(vec4_t *q1, vec3_t *pos1, vec4_t *q2, vec3_t *pos2, float s)
{ {
int i; int i;
@ -502,7 +488,6 @@ void R_StudioSlerpBones(vec4_t *q1, vec3_t *pos1, vec4_t *q2, vec3_t *pos2, floa
} }
} }
/* <83669> ../engine/r_studio.c:663 */
mstudioanim_t *R_GetAnim(model_t *psubmodel, mstudioseqdesc_t *pseqdesc) mstudioanim_t *R_GetAnim(model_t *psubmodel, mstudioseqdesc_t *pseqdesc)
{ {
mstudioseqgroup_t *pseqgroup; mstudioseqgroup_t *pseqgroup;
@ -528,7 +513,6 @@ mstudioanim_t *R_GetAnim(model_t *psubmodel, mstudioseqdesc_t *pseqdesc)
return (mstudioanim_t *)((char *)paSequences[pseqdesc->seqgroup].data + pseqdesc->animindex); return (mstudioanim_t *)((char *)paSequences[pseqdesc->seqgroup].data + pseqdesc->animindex);
} }
/* <836d8> ../engine/r_studio.c:696 */
void EXT_FUNC SV_StudioSetupBones(model_t *pModel, float frame, int sequence, const vec_t *angles, const vec_t *origin, const unsigned char *pcontroller, const unsigned char *pblending, int iBone, const edict_t *edict) void EXT_FUNC SV_StudioSetupBones(model_t *pModel, float frame, int sequence, const vec_t *angles, const vec_t *origin, const unsigned char *pcontroller, const unsigned char *pblending, int iBone, const edict_t *edict)
{ {
static vec4_t q1[128]; static vec4_t q1[128];
@ -622,7 +606,6 @@ void EXT_FUNC SV_StudioSetupBones(model_t *pModel, float frame, int sequence, co
} }
} }
/* <839e7> ../engine/r_studio.c:816 */
void SV_SetStudioHullPlane(mplane_t *pplane, int iBone, int k, float dist) void SV_SetStudioHullPlane(mplane_t *pplane, int iBone, int k, float dist)
{ {
pplane->type = 5; pplane->type = 5;
@ -637,7 +620,6 @@ void SV_SetStudioHullPlane(mplane_t *pplane, int iBone, int k, float dist)
+ dist; + dist;
} }
/* <83a1c> ../engine/r_studio.c:844 */
hull_t *R_StudioHull(model_t *pModel, float frame, int sequence, const vec_t *angles, const vec_t *origin, const vec_t *size, const unsigned char *pcontroller, const unsigned char *pblending, int *pNumHulls, const edict_t *pEdict, int bSkipShield) hull_t *R_StudioHull(model_t *pModel, float frame, int sequence, const vec_t *angles, const vec_t *origin, const vec_t *size, const unsigned char *pcontroller, const unsigned char *pblending, int *pNumHulls, const edict_t *pEdict, int bSkipShield)
{ {
SV_InitStudioHull(); SV_InitStudioHull();
@ -696,13 +678,11 @@ hull_t *R_StudioHull(model_t *pModel, float frame, int sequence, const vec_t *an
return &studio_hull[0]; return &studio_hull[0];
} }
/* <83d4f> ../engine/r_studio.c:924 */
int SV_HitgroupForStudioHull(int index) int SV_HitgroupForStudioHull(int index)
{ {
return studio_hull_hitgroup[index]; return studio_hull_hitgroup[index];
} }
/* <83d7c> ../engine/r_studio.c:935 */
NOXREF void R_InitStudioCache(void) NOXREF void R_InitStudioCache(void)
{ {
Q_memset(rgStudioCache, 0, sizeof(rgStudioCache)); Q_memset(rgStudioCache, 0, sizeof(rgStudioCache));
@ -712,13 +692,11 @@ NOXREF void R_InitStudioCache(void)
nCurrentPlane = 0; nCurrentPlane = 0;
} }
/* <83d8d> ../engine/r_studio.c:950 */
NOXREF void R_FlushStudioCache(void) NOXREF void R_FlushStudioCache(void)
{ {
R_InitStudioCache(); R_InitStudioCache();
} }
/* <83db3> ../engine/r_studio.c:957 */
int R_StudioBodyVariations(model_t *model) int R_StudioBodyVariations(model_t *model)
{ {
if (model->type != mod_studio) if (model->type != mod_studio)
@ -738,7 +716,6 @@ int R_StudioBodyVariations(model_t *model)
return count; return count;
} }
/* <83e4f> ../engine/r_studio.c:982 */
void R_StudioPlayerBlend(mstudioseqdesc_t *pseqdesc, int *pBlend, float *pPitch) void R_StudioPlayerBlend(mstudioseqdesc_t *pseqdesc, int *pBlend, float *pPitch)
{ {
*pBlend = (int)(*pPitch * 3.0); *pBlend = (int)(*pPitch * 3.0);
@ -768,7 +745,6 @@ void R_StudioPlayerBlend(mstudioseqdesc_t *pseqdesc, int *pBlend, float *pPitch)
} }
} }
/* <83e97> ../engine/r_studio.c:1015 */
hull_t *SV_HullForStudioModel(const edict_t *pEdict, const vec_t *mins, const vec_t *maxs, vec_t *offset, int *pNumHulls) hull_t *SV_HullForStudioModel(const edict_t *pEdict, const vec_t *mins, const vec_t *maxs, vec_t *offset, int *pNumHulls)
{ {
qboolean useComplexHull = FALSE; qboolean useComplexHull = FALSE;
@ -861,7 +837,6 @@ hull_t *SV_HullForStudioModel(const edict_t *pEdict, const vec_t *mins, const ve
} }
} }
/* <83f98> ../engine/r_studio.c:1232 */
qboolean DoesSphereIntersect(float *vSphereCenter, float fSphereRadiusSquared, float *vLinePt, float *vLineDir) qboolean DoesSphereIntersect(float *vSphereCenter, float fSphereRadiusSquared, float *vLinePt, float *vLineDir)
{ {
vec3_t P; vec3_t P;
@ -882,7 +857,6 @@ qboolean DoesSphereIntersect(float *vSphereCenter, float fSphereRadiusSquared, f
return insideSqr > 0.000001; return insideSqr > 0.000001;
} }
/* <8402e> ../engine/r_studio.c:1264 */
qboolean SV_CheckSphereIntersection(edict_t *ent, const vec_t *start, const vec_t *end) qboolean SV_CheckSphereIntersection(edict_t *ent, const vec_t *start, const vec_t *end)
{ {
studiohdr_t *studiohdr; studiohdr_t *studiohdr;
@ -916,12 +890,10 @@ qboolean SV_CheckSphereIntersection(edict_t *ent, const vec_t *start, const vec_
} }
/* <840e2> ../engine/r_studio.c:1302 */
void EXT_FUNC AnimationAutomove(const edict_t *pEdict, float flTime) void EXT_FUNC AnimationAutomove(const edict_t *pEdict, float flTime)
{ {
} }
/* <8411a> ../engine/r_studio.c:1329 */
void EXT_FUNC GetBonePosition(const edict_t *pEdict, int iBone, float *rgflOrigin, float *rgflAngles) void EXT_FUNC GetBonePosition(const edict_t *pEdict, int iBone, float *rgflOrigin, float *rgflAngles)
{ {
pstudiohdr = (studiohdr_t *)Mod_Extradata(g_psv.models[pEdict->v.modelindex]); pstudiohdr = (studiohdr_t *)Mod_Extradata(g_psv.models[pEdict->v.modelindex]);
@ -945,7 +917,6 @@ void EXT_FUNC GetBonePosition(const edict_t *pEdict, int iBone, float *rgflOrigi
} }
} }
/* <84171> ../engine/r_studio.c:1351 */
void EXT_FUNC GetAttachment(const edict_t *pEdict, int iAttachment, float *rgflOrigin, float *rgflAngles) void EXT_FUNC GetAttachment(const edict_t *pEdict, int iAttachment, float *rgflOrigin, float *rgflAngles)
{ {
mstudioattachment_t *pattachment; mstudioattachment_t *pattachment;
@ -954,7 +925,7 @@ void EXT_FUNC GetAttachment(const edict_t *pEdict, int iAttachment, float *rgflO
angles[0] = -pEdict->v.angles[0]; angles[0] = -pEdict->v.angles[0];
angles[1] = pEdict->v.angles[1]; angles[1] = pEdict->v.angles[1];
angles[2] = pEdict->v.angles[2]; angles[2] = pEdict->v.angles[2];
pstudiohdr = (studiohdr_t *)Mod_Extradata(g_psv.models[pEdict->v.modelindex]); pstudiohdr = (studiohdr_t *)Mod_Extradata(g_psv.models[pEdict->v.modelindex]);
pattachment = (mstudioattachment_t *)((char *)pstudiohdr + pstudiohdr->attachmentindex); pattachment = (mstudioattachment_t *)((char *)pstudiohdr + pstudiohdr->attachmentindex);
pattachment += iAttachment; pattachment += iAttachment;
@ -975,7 +946,6 @@ void EXT_FUNC GetAttachment(const edict_t *pEdict, int iAttachment, float *rgflO
VectorTransform(pattachment->org, (float *)bonetransform[pattachment->bone], rgflOrigin); VectorTransform(pattachment->org, (float *)bonetransform[pattachment->bone], rgflOrigin);
} }
/* <841ed> ../engine/r_studio.c:1379 */
int ModelFrameCount(model_t *model) int ModelFrameCount(model_t *model)
{ {
int count; int count;
@ -1003,7 +973,6 @@ int ModelFrameCount(model_t *model)
return count; return count;
} }
/* <84296> ../engine/r_studio.c:5618 */
void R_StudioBoundVertex(vec_t *mins, vec_t *maxs, int *vertcount, const vec_t *point) void R_StudioBoundVertex(vec_t *mins, vec_t *maxs, int *vertcount, const vec_t *point)
{ {
if (*vertcount) if (*vertcount)
@ -1016,7 +985,7 @@ void R_StudioBoundVertex(vec_t *mins, vec_t *maxs, int *vertcount, const vec_t *
if (maxs[i] < point[i]) if (maxs[i] < point[i])
maxs[i] = point[i]; maxs[i] = point[i];
} }
} }
else else
{ {
@ -1030,7 +999,6 @@ void R_StudioBoundVertex(vec_t *mins, vec_t *maxs, int *vertcount, const vec_t *
++(*vertcount); ++(*vertcount);
} }
/* <842fb> ../engine/r_studio.c:5640 */
void R_StudioBoundBone(vec_t *mins, vec_t *maxs, int *bonecount, const vec_t *point) void R_StudioBoundBone(vec_t *mins, vec_t *maxs, int *bonecount, const vec_t *point)
{ {
if (*bonecount) if (*bonecount)
@ -1057,7 +1025,6 @@ void R_StudioBoundBone(vec_t *mins, vec_t *maxs, int *bonecount, const vec_t *po
++(*bonecount); ++(*bonecount);
} }
/* <84360> ../engine/r_studio.c:5662 */
void R_StudioAccumulateBoneVerts(vec_t *mins, vec_t *maxs, int *vertcount, vec_t *bone_mins, vec_t *bone_maxs, int *bonecount) void R_StudioAccumulateBoneVerts(vec_t *mins, vec_t *maxs, int *vertcount, vec_t *bone_mins, vec_t *bone_maxs, int *bonecount)
{ {
vec3_t delta; vec3_t delta;
@ -1080,7 +1047,6 @@ void R_StudioAccumulateBoneVerts(vec_t *mins, vec_t *maxs, int *vertcount, vec_t
} }
} }
/* <843f3> ../engine/r_studio.c:5693 */
int R_StudioComputeBounds(unsigned char *pBuffer, float *mins, float *maxs) int R_StudioComputeBounds(unsigned char *pBuffer, float *mins, float *maxs)
{ {
vec3_t bone_mins; vec3_t bone_mins;
@ -1138,12 +1104,11 @@ int R_StudioComputeBounds(unsigned char *pBuffer, float *mins, float *maxs)
return 1; return 1;
} }
/* <845bc> ../engine/r_studio.c:5809 */
int R_GetStudioBounds(const char *filename, float *mins, float *maxs) int R_GetStudioBounds(const char *filename, float *mins, float *maxs)
{ {
int iret = 0; int iret = 0;
qboolean usingReadBuffer = 0; qboolean usingReadBuffer = 0;
for (int i = 0; i < 3; i++) for (int i = 0; i < 3; i++)
mins[0] = maxs[0] = vec3_origin[i]; mins[0] = maxs[0] = vec3_origin[i];
@ -1154,20 +1119,20 @@ int R_GetStudioBounds(const char *filename, float *mins, float *maxs)
FileHandle_t fp = FS_Open(filename, "rb"); FileHandle_t fp = FS_Open(filename, "rb");
if (!fp) if (!fp)
return 0; return 0;
int length; int length;
char *pBuffer = (char *)FS_GetReadBuffer(fp, &length); char *pBuffer = (char *)FS_GetReadBuffer(fp, &length);
if (pBuffer) if (pBuffer)
usingReadBuffer = 1; usingReadBuffer = 1;
else else
pBuffer = (char*) COM_LoadFile(filename, 5, 0); pBuffer = (char*) COM_LoadFile(filename, 5, 0);
if (pBuffer) if (pBuffer)
{ {
if (LittleLong(*(unsigned int *)pBuffer) == 'TSDI') if (LittleLong(*(unsigned int *)pBuffer) == 'TSDI')
iret = R_StudioComputeBounds((unsigned char*)pBuffer, mins, maxs); iret = R_StudioComputeBounds((unsigned char*)pBuffer, mins, maxs);
#ifndef REHLDS_FIXES #ifndef REHLDS_FIXES
//wrong release memory code //wrong release memory code
else else
COM_FreeFile(pBuffer); COM_FreeFile(pBuffer);
#endif #endif
@ -1183,7 +1148,6 @@ int R_GetStudioBounds(const char *filename, float *mins, float *maxs)
return iret; return iret;
} }
/* <8465f> ../engine/r_studio.c:6565 */
void R_ResetSvBlending(void) void R_ResetSvBlending(void)
{ {
g_pSvBlendingAPI = &svBlending; g_pSvBlendingAPI = &svBlending;

13
rehlds/engine/server.h
View File

@ -93,7 +93,6 @@
#define HL_GENERIC_MAX 512 #define HL_GENERIC_MAX 512
#define HL_EVENT_MAX 256 #define HL_EVENT_MAX 256
/* <87d6f> ../engine/server.h:43 */
typedef enum redirect_e typedef enum redirect_e
{ {
RD_NONE = 0, RD_NONE = 0,
@ -101,7 +100,6 @@ typedef enum redirect_e
RD_PACKET = 2, RD_PACKET = 2,
} redirect_t; } redirect_t;
/* <7588> ../engine/server.h:65 */
typedef enum server_state_e typedef enum server_state_e
{ {
ss_dead = 0, ss_dead = 0,
@ -109,7 +107,6 @@ typedef enum server_state_e
ss_active = 2, ss_active = 2,
} server_state_t; } server_state_t;
/* <75f3> ../engine/server.h:75 */
typedef struct server_s typedef struct server_s
{ {
qboolean active; qboolean active;
@ -180,8 +177,6 @@ struct rehlds_server_t {
#endif #endif
}; };
/* <3b30a> ../engine/server.h:163 */
typedef struct client_frame_s typedef struct client_frame_s
{ {
double senttime; double senttime;
@ -191,7 +186,6 @@ typedef struct client_frame_s
packet_entities_t entities; packet_entities_t entities;
} client_frame_t; } client_frame_t;
/* <2eb23> ../engine/server.h:177 */
typedef struct client_s typedef struct client_s
{ {
qboolean active; qboolean active;
@ -251,14 +245,12 @@ typedef struct client_s
int m_sendrescount; int m_sendrescount;
} client_t; } client_t;
/* <9e1af> ../engine/server.h:276 */
typedef enum sv_delta_s typedef enum sv_delta_s
{ {
sv_packet_nodelta, sv_packet_nodelta,
sv_packet_delta, sv_packet_delta,
} sv_delta_t; } sv_delta_t;
/* <9e1d1> ../engine/server.h:336 */
enum enum
{ {
SND_ANYPLAYER, SND_ANYPLAYER,
@ -268,7 +260,6 @@ enum
typedef struct rcon_failure_s rcon_failure_t; typedef struct rcon_failure_s rcon_failure_t;
typedef struct challenge_s challenge_t; typedef struct challenge_s challenge_t;
/* <a5b0c> ../engine/sv_main.c:5335 */
typedef struct deltacallback_s typedef struct deltacallback_s
{ {
int *numbase; int *numbase;
@ -663,8 +654,8 @@ int SV_CheckIPRestrictions_internal(netadr_t *adr, int nAuthProtocol);
int SV_CheckIPConnectionReuse(netadr_t *adr); int SV_CheckIPConnectionReuse(netadr_t *adr);
int SV_FinishCertificateCheck(netadr_t *adr, int nAuthProtocol, char *szRawCertificate, char *userinfo); int SV_FinishCertificateCheck(netadr_t *adr, int nAuthProtocol, char *szRawCertificate, char *userinfo);
int SV_FinishCertificateCheck_internal(netadr_t *adr, int nAuthProtocol, char *szRawCertificate, char *userinfo); int SV_FinishCertificateCheck_internal(netadr_t *adr, int nAuthProtocol, char *szRawCertificate, char *userinfo);
int SV_CheckKeyInfo(netadr_t *adr, char *protinfo, short unsigned int *port, int *pAuthProtocol, char *pszRaw, char *cdkey); int SV_CheckKeyInfo(netadr_t *adr, char *protinfo, unsigned short *port, int *pAuthProtocol, char *pszRaw, char *cdkey);
int SV_CheckKeyInfo_internal(netadr_t *adr, char *protinfo, short unsigned int *port, int *pAuthProtocol, char *pszRaw, char *cdkey); int SV_CheckKeyInfo_internal(netadr_t *adr, char *protinfo, unsigned short *port, int *pAuthProtocol, char *pszRaw, char *cdkey);
int SV_CheckForDuplicateSteamID(client_t *client); int SV_CheckForDuplicateSteamID(client_t *client);
int SV_CheckForDuplicateNames(char *userinfo, qboolean bIsReconnecting, int nExcludeSlot); int SV_CheckForDuplicateNames(char *userinfo, qboolean bIsReconnecting, int nExcludeSlot);
int SV_CheckUserInfo(netadr_t *adr, char *userinfo, qboolean bIsReconnecting, int nReconnectSlot, char *name); int SV_CheckUserInfo(netadr_t *adr, char *userinfo, qboolean bIsReconnecting, int nReconnectSlot, char *name);

5
rehlds/engine/server_static.h
View File

@ -35,8 +35,6 @@
#include "maintypes.h" #include "maintypes.h"
#include "netadr.h" #include "netadr.h"
/* <2e957> ../engine/server_static.h:13 */
typedef struct server_log_s typedef struct server_log_s
{ {
qboolean active; qboolean active;
@ -45,7 +43,6 @@ typedef struct server_log_s
void *file; void *file;
} server_log_t; } server_log_t;
/* <2e9a3> ../engine/server_static.h:22 */
typedef struct server_stats_s typedef struct server_stats_s
{ {
int num_samples; int num_samples;
@ -64,7 +61,6 @@ typedef struct server_stats_s
float average_latency; float average_latency;
} server_stats_t; } server_stats_t;
/* <2ea7b> ../engine/server_static.h:43 */
typedef struct server_static_s typedef struct server_static_s
{ {
qboolean dll_initialized; qboolean dll_initialized;
@ -80,5 +76,4 @@ typedef struct server_static_s
qboolean isSecure; qboolean isSecure;
} server_static_t; } server_static_t;
#endif // SERVER_STATIC_H #endif // SERVER_STATIC_H

79
rehlds/engine/snd_null.cpp
View File

@ -28,77 +28,28 @@
#include "precompiled.h" #include "precompiled.h"
/* <84fa2> ../engine/snd_null.c:16 */ void S_Init() { }
void S_Init(void) { } void S_AmbientOff() { }
void S_AmbientOn() { }
/* <84fb6> ../engine/snd_null.c:18 */ void S_Shutdown() { }
void S_AmbientOff(void) { }
/* <84fca> ../engine/snd_null.c:20 */
void S_AmbientOn(void) { }
/* <84fde> ../engine/snd_null.c:22 */
void S_Shutdown(void) { }
/* <84ff2> ../engine/snd_null.c:24 */
void S_TouchSound(char *sample) { } void S_TouchSound(char *sample) { }
void S_ClearBuffer() { }
/* <85019> ../engine/snd_null.c:26 */
void S_ClearBuffer(void) { }
/* <8502d> ../engine/snd_null.c:28 */
void S_StartStaticSound(int entnum, int entchannel, sfx_t *sfx, vec_t *origin, float vol, float attenuation, int flags, int pitch) { } void S_StartStaticSound(int entnum, int entchannel, sfx_t *sfx, vec_t *origin, float vol, float attenuation, int flags, int pitch) { }
/* <850bc> ../engine/snd_null.c:30 */
void S_StartDynamicSound(int entnum, int entchannel, sfx_t *sfx, vec_t *origin, float fvol, float attenuation, int flags, int pitch) { } void S_StartDynamicSound(int entnum, int entchannel, sfx_t *sfx, vec_t *origin, float fvol, float attenuation, int flags, int pitch) { }
/* <85145> ../engine/snd_null.c:32 */
void S_StopSound(int entnum, int entchannel) { } void S_StopSound(int entnum, int entchannel) { }
/* <8517a> ../engine/snd_null.c:34 */
sfx_t *S_PrecacheSound(char *sample) { return NULL; } sfx_t *S_PrecacheSound(char *sample) { return NULL; }
void S_ClearPrecache() { }
/* <851a5> ../engine/snd_null.c:36 */
void S_ClearPrecache(void) { }
/* <851b9> ../engine/snd_null.c:38 */
void S_Update(vec_t *origin, vec_t *v_forward, vec_t *v_right, vec_t *v_up) { } void S_Update(vec_t *origin, vec_t *v_forward, vec_t *v_right, vec_t *v_up) { }
/* <8520a> ../engine/snd_null.c:40 */
void S_StopAllSounds(qboolean clear) { } void S_StopAllSounds(qboolean clear) { }
void S_BeginPrecaching() { }
/* <85231> ../engine/snd_null.c:42 */ void S_EndPrecaching() { }
void S_BeginPrecaching(void) { } void S_ExtraUpdate() { }
/* <85245> ../engine/snd_null.c:44 */
void S_EndPrecaching(void) { }
/* <85259> ../engine/snd_null.c:46 */
void S_ExtraUpdate(void) { }
/* <8526d> ../engine/snd_null.c:48 */
void S_LocalSound(char *s) { } void S_LocalSound(char *s) { }
void S_BlockSound() { }
/* <85292> ../engine/snd_null.c:50 */ void S_PrintStats() { }
void S_BlockSound(void) { }
/* <852a6> ../engine/snd_null.c:52 */
void S_PrintStats(void) { }
/* <852ba> ../engine/snd_null.c:55 */
qboolean Voice_RecordStart(const char *pUncompressedFile, const char *pDecompressedFile, const char *pMicInputFile) { return FALSE; } qboolean Voice_RecordStart(const char *pUncompressedFile, const char *pDecompressedFile, const char *pMicInputFile) { return FALSE; }
qboolean Voice_IsRecording() { return FALSE; }
/* <85301> ../engine/snd_null.c:56 */ void Voice_RegisterCvars() { }
qboolean Voice_IsRecording(void) { return FALSE; } void Voice_Deinit() { }
/* <85319> ../engine/snd_null.c:57 */
void Voice_RegisterCvars(void) { }
/* <8532d> ../engine/snd_null.c:58 */
void Voice_Deinit(void) { }
/* <85341> ../engine/snd_null.c:59 */
void Voice_Idle(float frametime) { } void Voice_Idle(float frametime) { }
qboolean Voice_RecordStop() { return TRUE; }
/* <85368> ../engine/snd_null.c:60 */
qboolean Voice_RecordStop(void) { return TRUE; }

31
rehlds/engine/sound.h
View File

@ -37,7 +37,6 @@
// max number of sentences in game. NOTE: this must match CVOXFILESENTENCEMAX in dlls\util.h!!! // max number of sentences in game. NOTE: this must match CVOXFILESENTENCEMAX in dlls\util.h!!!
#define CVOXFILESENTENCEMAX 1536 #define CVOXFILESENTENCEMAX 1536
/* <2e874> ../engine/sound.h:26 */
typedef struct sfx_s typedef struct sfx_s
{ {
char name[64]; char name[64];
@ -45,30 +44,30 @@ typedef struct sfx_s
int servercount; int servercount;
} sfx_t; } sfx_t;
void S_Init(void); void S_Init();
void S_AmbientOff(void); void S_AmbientOff();
void S_AmbientOn(void); void S_AmbientOn();
void S_Shutdown(void); void S_Shutdown();
void S_TouchSound(char *sample); void S_TouchSound(char *sample);
void S_ClearBuffer(void); void S_ClearBuffer();
void S_StartStaticSound(int entnum, int entchannel, sfx_t *sfx, vec_t *origin, float vol, float attenuation, int flags, int pitch); void S_StartStaticSound(int entnum, int entchannel, sfx_t *sfx, vec_t *origin, float vol, float attenuation, int flags, int pitch);
void S_StartDynamicSound(int entnum, int entchannel, sfx_t *sfx, vec_t *origin, float fvol, float attenuation, int flags, int pitch); void S_StartDynamicSound(int entnum, int entchannel, sfx_t *sfx, vec_t *origin, float fvol, float attenuation, int flags, int pitch);
void S_StopSound(int entnum, int entchannel); void S_StopSound(int entnum, int entchannel);
sfx_t *S_PrecacheSound(char *sample); sfx_t *S_PrecacheSound(char *sample);
void S_ClearPrecache(void); void S_ClearPrecache();
void S_Update(vec_t * origin, vec_t * v_forward, vec_t * v_right, vec_t * v_up); void S_Update(vec_t * origin, vec_t * v_forward, vec_t * v_right, vec_t * v_up);
void S_StopAllSounds(qboolean clear); void S_StopAllSounds(qboolean clear);
void S_BeginPrecaching(void); void S_BeginPrecaching();
void S_EndPrecaching(void); void S_EndPrecaching();
void S_ExtraUpdate(void); void S_ExtraUpdate();
void S_LocalSound(char * s); void S_LocalSound(char * s);
void S_BlockSound(void); void S_BlockSound();
void S_PrintStats(void); void S_PrintStats();
qboolean Voice_RecordStart(const char * pUncompressedFile, const char * pDecompressedFile, const char * pMicInputFile); qboolean Voice_RecordStart(const char * pUncompressedFile, const char * pDecompressedFile, const char * pMicInputFile);
qboolean Voice_IsRecording(void); qboolean Voice_IsRecording();
void Voice_RegisterCvars(void); void Voice_RegisterCvars();
void Voice_Deinit(void); void Voice_Deinit();
void Voice_Idle(float frametime); void Voice_Idle(float frametime);
qboolean Voice_RecordStop(void); qboolean Voice_RecordStop();
#endif // SOUND_H #endif // SOUND_H

14
rehlds/engine/sv_log.cpp
View File

@ -38,14 +38,13 @@ LOGLIST_T *firstLog;
cvar_t mp_logecho = { "mp_logecho", "1", 0, 0.0f, NULL }; cvar_t mp_logecho = { "mp_logecho", "1", 0, 0.0f, NULL };
cvar_t mp_logfile = { "mp_logfile", "1", FCVAR_SERVER, 0.0f, NULL }; cvar_t mp_logfile = { "mp_logfile", "1", FCVAR_SERVER, 0.0f, NULL };
#else //HOOK_ENGINE #else // HOOK_ENGINE
cvar_t mp_logecho; cvar_t mp_logecho;
cvar_t mp_logfile; cvar_t mp_logfile;
#endif //HOOK_ENGINE #endif // HOOK_ENGINE
/* <9a0ba> ../engine/sv_log.c:37 */
void Log_Printf(const char *fmt, ...) void Log_Printf(const char *fmt, ...)
{ {
va_list argptr; va_list argptr;
@ -102,7 +101,6 @@ void Log_Printf(const char *fmt, ...)
} }
} }
/* <9a15f> ../engine/sv_log.c:118 */
void Log_PrintServerVars(void) void Log_PrintServerVars(void)
{ {
cvar_t *var; cvar_t *var;
@ -118,7 +116,6 @@ void Log_PrintServerVars(void)
Log_Printf("Server cvars end\n"); Log_Printf("Server cvars end\n");
} }
/* <9a18e> ../engine/sv_log.c:145 */
void Log_Close(void) void Log_Close(void)
{ {
if (g_psvs.log.file) if (g_psvs.log.file)
@ -129,7 +126,6 @@ void Log_Close(void)
g_psvs.log.file = NULL; g_psvs.log.file = NULL;
} }
/* <9a1a9> ../engine/sv_log.c:162 */
void Log_Open(void) void Log_Open(void)
{ {
time_t ltime; time_t ltime;
@ -185,7 +181,6 @@ void Log_Open(void)
} }
} }
/* <9a237> ../engine/sv_log.c:266 */
void SV_SetLogAddress_f(void) void SV_SetLogAddress_f(void)
{ {
const char *s; const char *s;
@ -228,7 +223,6 @@ void SV_SetLogAddress_f(void)
Con_Printf("logaddress: %s\n", NET_AdrToString(adr)); Con_Printf("logaddress: %s\n", NET_AdrToString(adr));
} }
/* <9a28f> ../engine/sv_log.c:321 */
void SV_AddLogAddress_f(void) void SV_AddLogAddress_f(void)
{ {
const char *s; const char *s;
@ -320,7 +314,6 @@ void SV_AddLogAddress_f(void)
Con_Printf("logaddress_add: %s\n", NET_AdrToString(adr)); Con_Printf("logaddress_add: %s\n", NET_AdrToString(adr));
} }
/* <9a345> ../engine/sv_log.c:439 */
void SV_DelLogAddress_f(void) void SV_DelLogAddress_f(void)
{ {
const char *s; const char *s;
@ -394,7 +387,6 @@ void SV_DelLogAddress_f(void)
Con_Printf("deleting: %s\n", NET_AdrToString(adr)); Con_Printf("deleting: %s\n", NET_AdrToString(adr));
} }
/* <9a3f1> ../engine/sv_log.c:543 */
void SV_ServerLog_f(void) void SV_ServerLog_f(void)
{ {
if (Cmd_Argc() != 2) if (Cmd_Argc() != 2)
@ -409,7 +401,7 @@ void SV_ServerLog_f(void)
} }
const char *s = Cmd_Argv(1); const char *s = Cmd_Argv(1);
if (Q_stricmp(s,"off")) if (Q_stricmp(s, "off"))
{ {
if (Q_stricmp(s, "on")) if (Q_stricmp(s, "on"))
Con_Printf("log: unknown parameter %s, 'on' and 'off' are valid\n", s); Con_Printf("log: unknown parameter %s, 'on' and 'off' are valid\n", s);

1
rehlds/engine/sv_log.h
View File

@ -34,7 +34,6 @@
#include "maintypes.h" #include "maintypes.h"
/* <9a080> ../engine/sv_log.c:23 */
typedef struct loglist typedef struct loglist
{ {
server_log_t log; server_log_t log;

259
rehlds/engine/sv_main.cpp
View File

File diff suppressed because it is too large Load Diff

25
rehlds/engine/sv_move.cpp
View File

@ -43,7 +43,6 @@ int c_no;
#endif //HOOK_ENGINE #endif //HOOK_ENGINE
/* <ade4a> ../engine/sv_move.c:27 */
qboolean SV_CheckBottom(edict_t *ent) qboolean SV_CheckBottom(edict_t *ent)
{ {
vec3_t mins; vec3_t mins;
@ -90,7 +89,7 @@ realcheck:
return 0; return 0;
mid = bottom = trace.endpos[2]; mid = bottom = trace.endpos[2];
for (x = 0; x <= 1; x++) for (x = 0; x <= 1; x++)
{ {
for (y = 0; y <= 1; y++) for (y = 0; y <= 1; y++)
@ -110,7 +109,6 @@ realcheck:
return 1; return 1;
} }
/* <adf79> ../engine/sv_move.c:106 */
qboolean SV_movetest(edict_t *ent, vec_t *move, qboolean relink) qboolean SV_movetest(edict_t *ent, vec_t *move, qboolean relink)
{ {
vec3_t oldorg; vec3_t oldorg;
@ -127,7 +125,7 @@ qboolean SV_movetest(edict_t *ent, vec_t *move, qboolean relink)
neworg[2] = ent->v.origin[2] + move[2]; neworg[2] = ent->v.origin[2] + move[2];
end[0] = neworg[0]; end[0] = neworg[0];
end[1] = neworg[1]; end[1] = neworg[1];
neworg[2] += sv_stepsize.value; neworg[2] += sv_stepsize.value;
end[2] = neworg[2] - (2 * sv_stepsize.value); end[2] = neworg[2] - (2 * sv_stepsize.value);
trace = SV_MoveNoEnts(neworg, ent->v.mins, ent->v.maxs, end, 0, ent); trace = SV_MoveNoEnts(neworg, ent->v.mins, ent->v.maxs, end, 0, ent);
@ -185,7 +183,6 @@ qboolean SV_movetest(edict_t *ent, vec_t *move, qboolean relink)
return 1; return 1;
} }
/* <addc1> ../engine/sv_move.c:197 */
qboolean SV_movestep(edict_t *ent, vec_t *move, qboolean relink) qboolean SV_movestep(edict_t *ent, vec_t *move, qboolean relink)
{ {
trace_t trace; trace_t trace;
@ -198,7 +195,7 @@ qboolean SV_movestep(edict_t *ent, vec_t *move, qboolean relink)
oldorg[0] = ent->v.origin[0]; oldorg[0] = ent->v.origin[0];
oldorg[1] = ent->v.origin[1]; oldorg[1] = ent->v.origin[1];
oldorg[2] = ent->v.origin[2]; oldorg[2] = ent->v.origin[2];
start[0] = ent->v.origin[0] + move[0]; start[0] = ent->v.origin[0] + move[0];
start[1] = ent->v.origin[1] + move[1]; start[1] = ent->v.origin[1] + move[1];
start[2] = ent->v.origin[2] + move[2]; start[2] = ent->v.origin[2] + move[2];
@ -212,8 +209,8 @@ qboolean SV_movestep(edict_t *ent, vec_t *move, qboolean relink)
start[1] = ent->v.origin[1] + move[1]; start[1] = ent->v.origin[1] + move[1];
start[2] = ent->v.origin[2] + move[2]; start[2] = ent->v.origin[2] + move[2];
edict_t* enemy = ent->v.enemy; edict_t* enemy = ent->v.enemy;
if (i == 0 && enemy) if (i == 0 && enemy)
{ {
dz = ent->v.origin[2] - enemy->v.origin[2]; dz = ent->v.origin[2] - enemy->v.origin[2];
@ -306,7 +303,6 @@ qboolean SV_movestep(edict_t *ent, vec_t *move, qboolean relink)
return 1; return 1;
} }
/* <ae06b> ../engine/sv_move.c:333 */
qboolean SV_StepDirection(edict_t *ent, float yaw, float dist) qboolean SV_StepDirection(edict_t *ent, float yaw, float dist)
{ {
vec3_t move; vec3_t move;
@ -326,7 +322,6 @@ qboolean SV_StepDirection(edict_t *ent, float yaw, float dist)
} }
} }
/* <ae0f7> ../engine/sv_move.c:381 */
qboolean SV_FlyDirection(edict_t *ent, vec_t *direction) qboolean SV_FlyDirection(edict_t *ent, vec_t *direction)
{ {
if (SV_movestep(ent, direction, 0)) if (SV_movestep(ent, direction, 0))
@ -341,13 +336,11 @@ qboolean SV_FlyDirection(edict_t *ent, vec_t *direction)
} }
} }
/* <ae15a> ../engine/sv_move.c:402 */
void SV_FixCheckBottom(edict_t *ent) void SV_FixCheckBottom(edict_t *ent)
{ {
ent->v.flags |= FL_PARTIALGROUND; ent->v.flags |= FL_PARTIALGROUND;
} }
/* <ae177> ../engine/sv_move.c:418 */
NOXREF void SV_NewChaseDir(edict_t *actor, edict_t *enemy, float dist) NOXREF void SV_NewChaseDir(edict_t *actor, edict_t *enemy, float dist)
{ {
float deltax; float deltax;
@ -382,7 +375,7 @@ NOXREF void SV_NewChaseDir(edict_t *actor, edict_t *enemy, float dist)
tdir = d[2] == 90.0 ? 45.0 : 315.0; tdir = d[2] == 90.0 ? 45.0 : 315.0;
else else
tdir = d[2] == 90.0 ? 135.0 : 215.0; tdir = d[2] == 90.0 ? 135.0 : 215.0;
if (tdir != turnaround && SV_StepDirection(actor, tdir, dist)) if (tdir != turnaround && SV_StepDirection(actor, tdir, dist))
return; return;
} }
@ -425,7 +418,6 @@ NOXREF void SV_NewChaseDir(edict_t *actor, edict_t *enemy, float dist)
SV_FixCheckBottom(actor); SV_FixCheckBottom(actor);
} }
/* <ae41e> ../engine/sv_move.c:507 */
NOXREF qboolean SV_CloseEnough(edict_t *ent, edict_t *goal, float dist) NOXREF qboolean SV_CloseEnough(edict_t *ent, edict_t *goal, float dist)
{ {
int i; int i;
@ -439,7 +431,6 @@ NOXREF qboolean SV_CloseEnough(edict_t *ent, edict_t *goal, float dist)
return TRUE; return TRUE;
} }
/* <ae477> ../engine/sv_move.c:528 */
NOXREF qboolean SV_ReachedGoal(edict_t *ent, vec_t *vecGoal, float flDist) NOXREF qboolean SV_ReachedGoal(edict_t *ent, vec_t *vecGoal, float flDist)
{ {
int i; int i;
@ -453,7 +444,6 @@ NOXREF qboolean SV_ReachedGoal(edict_t *ent, vec_t *vecGoal, float flDist)
return TRUE; return TRUE;
} }
/* <ae4d0> ../engine/sv_move.c:601 */
void SV_NewChaseDir2(edict_t *actor, vec_t *vecGoal, float dist) void SV_NewChaseDir2(edict_t *actor, vec_t *vecGoal, float dist)
{ {
float deltax; float deltax;
@ -536,7 +526,6 @@ void SV_NewChaseDir2(edict_t *actor, vec_t *vecGoal, float dist)
} }
} }
/* <ae777> ../engine/sv_move.c:690 */
void EXT_FUNC SV_MoveToOrigin_I(edict_t *ent, const float *pflGoal, float dist, int iStrafe) void EXT_FUNC SV_MoveToOrigin_I(edict_t *ent, const float *pflGoal, float dist, int iStrafe)
{ {
vec3_t vecGoal; vec3_t vecGoal;
@ -545,7 +534,7 @@ void EXT_FUNC SV_MoveToOrigin_I(edict_t *ent, const float *pflGoal, float dist,
vecGoal[0] = pflGoal[0]; vecGoal[0] = pflGoal[0];
vecGoal[1] = pflGoal[1]; vecGoal[1] = pflGoal[1];
vecGoal[2] = pflGoal[2]; vecGoal[2] = pflGoal[2];
if (ent->v.flags & (FL_ONGROUND | FL_SWIM | FL_FLY)) if (ent->v.flags & (FL_ONGROUND | FL_SWIM | FL_FLY))
{ {
if (iStrafe) if (iStrafe)

171
rehlds/engine/sv_phys.cpp
View File

@ -43,7 +43,7 @@ cvar_t sv_stepsize = { "sv_stepsize", "18", FCVAR_SERVER, 0.0f, NULL };
cvar_t sv_friction = { "sv_friction", "4", FCVAR_SERVER, 0.0f, NULL }; cvar_t sv_friction = { "sv_friction", "4", FCVAR_SERVER, 0.0f, NULL };
cvar_t sv_stopspeed = { "sv_stopspeed", "100", FCVAR_SERVER, 0.0f, NULL }; cvar_t sv_stopspeed = { "sv_stopspeed", "100", FCVAR_SERVER, 0.0f, NULL };
#else //HOOK_ENGINE #else // HOOK_ENGINE
cvar_t sv_maxvelocity; cvar_t sv_maxvelocity;
cvar_t sv_gravity; cvar_t sv_gravity;
@ -52,9 +52,8 @@ cvar_t sv_stepsize;
cvar_t sv_friction; cvar_t sv_friction;
cvar_t sv_stopspeed; cvar_t sv_stopspeed;
#endif //HOOK_ENGINE #endif // HOOK_ENGINE
/* <b54f7> ../engine/sv_phys.c:66 */
NOXREF void SV_CheckAllEnts(void) NOXREF void SV_CheckAllEnts(void)
{ {
int e; int e;
@ -81,7 +80,6 @@ NOXREF void SV_CheckAllEnts(void)
} }
} }
/* <b552d> ../engine/sv_phys.c:93 */
void SV_CheckVelocity(edict_t *ent) void SV_CheckVelocity(edict_t *ent)
{ {
for (int i = 0; i < 3; i++) for (int i = 0; i < 3; i++)
@ -108,19 +106,12 @@ void SV_CheckVelocity(edict_t *ent)
ent->v.velocity[i] = -sv_maxvelocity.value; ent->v.velocity[i] = -sv_maxvelocity.value;
} }
} }
} /* size: 3408238 */ }
/* // Runs thinking code if time. There is some play in the exact time the think
============= // function will be called, because it is called before any movement is done
SV_RunThink // in a frame. Not used for pushmove objects, because they must be exact.
// Returns false if the entity removed itself.
Runs thinking code if time. There is some play in the exact time the think
function will be called, because it is called before any movement is done
in a frame. Not used for pushmove objects, because they must be exact.
Returns false if the entity removed itself.
=============
*/
/* <b5386> ../engine/sv_phys.c:135 */
qboolean SV_RunThink(edict_t *ent) qboolean SV_RunThink(edict_t *ent)
{ {
float thinktime; float thinktime;
@ -151,7 +142,6 @@ qboolean SV_RunThink(edict_t *ent)
return !ent->free; return !ent->free;
} }
/* <b53af> ../engine/sv_phys.c:170 */
void SV_Impact(edict_t *e1, edict_t *e2, trace_t *ptrace) void SV_Impact(edict_t *e1, edict_t *e2, trace_t *ptrace)
{ {
gGlobalVariables.time = (float) g_psv.time; gGlobalVariables.time = (float) g_psv.time;
@ -187,9 +177,8 @@ void SV_Impact(edict_t *e1, edict_t *e2, trace_t *ptrace)
SV_SetGlobalTrace(ptrace); SV_SetGlobalTrace(ptrace);
gEntityInterface.pfnTouch(e2, e1); gEntityInterface.pfnTouch(e2, e1);
} }
} /* size: 168087284 */ }
/* <b5605> ../engine/sv_phys.c:216 */
int ClipVelocity(vec_t *in, vec_t *normal, vec_t *out, float overbounce) int ClipVelocity(vec_t *in, vec_t *normal, vec_t *out, float overbounce)
{ {
int blocked = 0; int blocked = 0;
@ -207,9 +196,8 @@ int ClipVelocity(vec_t *in, vec_t *normal, vec_t *out, float overbounce)
} }
return blocked; return blocked;
} /* size: 4 */ }
/* <b53e3> ../engine/sv_phys.c:264 */
int SV_FlyMove(edict_t *ent, float time, trace_t *steptrace) int SV_FlyMove(edict_t *ent, float time, trace_t *steptrace)
{ {
vec_t planes[5][3]; vec_t planes[5][3];
@ -372,23 +360,21 @@ int SV_FlyMove(edict_t *ent, float time, trace_t *steptrace)
} }
return blocked; return blocked;
} /* size: 4 */ }
/* <b578b> ../engine/sv_phys.c:450 */
void SV_AddGravity(edict_t *ent) void SV_AddGravity(edict_t *ent)
{ {
float ent_gravity; // 452 float ent_gravity;
if (ent->v.gravity == 0.0) if (ent->v.gravity == 0.0)
ent_gravity = 1.0; ent_gravity = 1.0;
else else
ent_gravity = ent->v.gravity; ent_gravity = ent->v.gravity;
ent_gravity = (float)(ent->v.velocity[2] - sv_gravity.value * ent_gravity * host_frametime); ent_gravity = (float)(ent->v.velocity[2] - sv_gravity.value * ent_gravity * host_frametime);
ent->v.velocity[2] = (float)(ent_gravity + ent->v.basevelocity[2] * host_frametime); ent->v.velocity[2] = (float)(ent_gravity + ent->v.basevelocity[2] * host_frametime);
ent->v.basevelocity[2] = 0; ent->v.basevelocity[2] = 0;
SV_CheckVelocity(ent); SV_CheckVelocity(ent);
} /* size: 2 */ }
/* <b57b2> ../engine/sv_phys.c:467 */
NOXREF void SV_AddCorrectGravity(edict_t *ent) NOXREF void SV_AddCorrectGravity(edict_t *ent)
{ {
float ent_gravity = 1.0f; float ent_gravity = 1.0f;
@ -402,7 +388,6 @@ NOXREF void SV_AddCorrectGravity(edict_t *ent)
SV_CheckVelocity(ent); SV_CheckVelocity(ent);
} }
/* <b57ec> ../engine/sv_phys.c:485 */
NOXREF void SV_FixupGravityVelocity(edict_t *ent) NOXREF void SV_FixupGravityVelocity(edict_t *ent)
{ {
float ent_gravity = 1.0f; float ent_gravity = 1.0f;
@ -413,13 +398,12 @@ NOXREF void SV_FixupGravityVelocity(edict_t *ent)
SV_CheckVelocity(ent); SV_CheckVelocity(ent);
} }
/* <b5826> ../engine/sv_phys.c:515 */
trace_t SV_PushEntity(edict_t *ent, vec_t *push) trace_t SV_PushEntity(edict_t *ent, vec_t *push)
{ {
trace_t trace; // 517 trace_t trace;
vec3_t end; // 518 vec3_t end;
int moveType; int moveType;
end[0] = push[0] + ent->v.origin[0]; end[0] = push[0] + ent->v.origin[0];
end[1] = push[1] + ent->v.origin[1]; end[1] = push[1] + ent->v.origin[1];
end[2] = push[2] + ent->v.origin[2]; end[2] = push[2] + ent->v.origin[2];
@ -441,17 +425,16 @@ trace_t SV_PushEntity(edict_t *ent, vec_t *push)
SV_LinkEdict(ent, 1); SV_LinkEdict(ent, 1);
if (trace.ent) if (trace.ent)
SV_Impact(ent, trace.ent, &trace); SV_Impact(ent, trace.ent, &trace);
return trace;
} /* size: 56 */
/* <b58a2> ../engine/sv_phys.c:558 */ return trace;
}
void SV_PushMove(edict_t *pusher, float movetime) void SV_PushMove(edict_t *pusher, float movetime)
{ {
vec3_t mins; // 562 vec3_t mins;
vec3_t maxs; // 562 vec3_t maxs;
vec3_t move; // 562 vec3_t move;
vec3_t pushorig; // 563 vec3_t pushorig;
if (pusher->v.velocity[0] == 0.0f && pusher->v.velocity[1] == 0.0f && pusher->v.velocity[2] == 0.0f) if (pusher->v.velocity[0] == 0.0f && pusher->v.velocity[1] == 0.0f && pusher->v.velocity[2] == 0.0f)
{ {
@ -503,7 +486,7 @@ void SV_PushMove(edict_t *pusher, float movetime)
{ {
if (check->v.movetype != MOVETYPE_WALK) if (check->v.movetype != MOVETYPE_WALK)
check->v.flags &= ~FL_ONGROUND; check->v.flags &= ~FL_ONGROUND;
vec3_t entorigin; vec3_t entorigin;
entorigin[0] = check->v.origin[0]; entorigin[0] = check->v.origin[0];
entorigin[1] = check->v.origin[1]; entorigin[1] = check->v.origin[1];
@ -515,7 +498,7 @@ void SV_PushMove(edict_t *pusher, float movetime)
g_moved_from[num_moved][2] = check->v.origin[2]; g_moved_from[num_moved][2] = check->v.origin[2];
g_moved_edict[num_moved] = check; g_moved_edict[num_moved] = check;
++num_moved; ++num_moved;
SV_PushEntity(check, move); SV_PushEntity(check, move);
pusher->v.solid = SOLID_BSP; pusher->v.solid = SOLID_BSP;
@ -559,20 +542,18 @@ void SV_PushMove(edict_t *pusher, float movetime)
return; return;
} }
} }
}
} /* size: 168100728 */
/* <b5965> ../engine/sv_phys.c:689 */
int SV_PushRotate(edict_t *pusher, float movetime) int SV_PushRotate(edict_t *pusher, float movetime)
{ {
vec3_t amove; // 693 vec3_t amove;
vec3_t pushorig; // 694 vec3_t pushorig;
vec3_t forward; // 698 vec3_t forward;
vec3_t right; // 698 vec3_t right;
vec3_t up; // 698 vec3_t up;
vec3_t forwardNow; // 699 vec3_t forwardNow;
vec3_t rightNow; // 699 vec3_t rightNow;
vec3_t upNow; // 699 vec3_t upNow;
if (pusher->v.avelocity[0] == 0.0 && pusher->v.avelocity[1] == 0.0 && pusher->v.avelocity[2] == 0.0) if (pusher->v.avelocity[0] == 0.0 && pusher->v.avelocity[1] == 0.0 && pusher->v.avelocity[2] == 0.0)
{ {
@ -689,7 +670,7 @@ int SV_PushRotate(edict_t *pusher, float movetime)
if (!SV_TestEntityPosition(check) || check->v.mins[0] == check->v.maxs[0]) if (!SV_TestEntityPosition(check) || check->v.mins[0] == check->v.maxs[0])
continue; continue;
if (check->v.solid == SOLID_NOT || check->v.solid == SOLID_TRIGGER) if (check->v.solid == SOLID_NOT || check->v.solid == SOLID_TRIGGER)
{ {
check->v.mins[1] = 0.0f; check->v.mins[1] = 0.0f;
@ -739,9 +720,8 @@ int SV_PushRotate(edict_t *pusher, float movetime)
} }
return 1; return 1;
} /* size: 4 */ }
/* <b5aab> ../engine/sv_phys.c:865 */
void SV_Physics_Pusher(edict_t *ent) void SV_Physics_Pusher(edict_t *ent)
{ {
float thinktime = ent->v.nextthink; float thinktime = ent->v.nextthink;
@ -784,7 +764,8 @@ void SV_Physics_Pusher(edict_t *ent)
} }
} }
for (int i = 0; i < 3; i++) { for (int i = 0; i < 3; i++)
{
if (ent->v.angles[i] < -3600.0f || ent->v.angles[i] > 3600.0f) if (ent->v.angles[i] < -3600.0f || ent->v.angles[i] > 3600.0f)
ent->v.angles[i] = fmod(ent->v.angles[i], 3600.0f); ent->v.angles[i] = fmod(ent->v.angles[i], 3600.0f);
} }
@ -799,9 +780,8 @@ void SV_Physics_Pusher(edict_t *ent)
gGlobalVariables.time = (float) g_psv.time; gGlobalVariables.time = (float) g_psv.time;
gEntityInterface.pfnThink(ent); gEntityInterface.pfnThink(ent);
} }
} /* size: 983224 */ }
/* <b5b2d> ../engine/sv_phys.c:935 */
qboolean SV_CheckWater(edict_t *ent) qboolean SV_CheckWater(edict_t *ent)
{ {
vec3_t point; vec3_t point;
@ -824,7 +804,6 @@ qboolean SV_CheckWater(edict_t *ent)
} }
else else
{ {
g_groupmask = ent->v.groupinfo; g_groupmask = ent->v.groupinfo;
point[2] = (ent->v.absmax[2] + ent->v.absmin[2]) * 0.5f; point[2] = (ent->v.absmax[2] + ent->v.absmin[2]) * 0.5f;
int truecont = SV_PointContents(point); int truecont = SV_PointContents(point);
@ -857,10 +836,8 @@ qboolean SV_CheckWater(edict_t *ent)
} }
return (ent->v.waterlevel > 1) ? 1 : 0; return (ent->v.waterlevel > 1) ? 1 : 0;
} }
/* <b5bbc> ../engine/sv_phys.c:1002 */
float SV_RecursiveWaterLevel(vec_t *center, float out, float in, int count) float SV_RecursiveWaterLevel(vec_t *center, float out, float in, int count)
{ {
float offset = (float)((out - in) * 0.5 + in); float offset = (float)((out - in) * 0.5 + in);
@ -879,22 +856,12 @@ float SV_RecursiveWaterLevel(vec_t *center, float out, float in, int count)
{ {
return offset; return offset;
} }
} /* size: 0 */ }
/* <b61dc> ../engine/sv_phys.c:1024 */
float SV_Submerged(edict_t *ent) float SV_Submerged(edict_t *ent)
{ {
// float start; // 1026 float end;
float end; // 1026 vec3_t center;
// float bottom; // 1026
vec3_t center; // 1027
// {
// vec3_t point; // 1044
// }
// SV_RecursiveWaterLevel(vec_t *center,
// float out,
// float in,
// int count); // 1059
center[0] = (ent->v.absmax[0] + ent->v.absmin[0]) * 0.5f; center[0] = (ent->v.absmax[0] + ent->v.absmin[0]) * 0.5f;
center[1] = (ent->v.absmax[1] + ent->v.absmin[1]) * 0.5f; center[1] = (ent->v.absmax[1] + ent->v.absmin[1]) * 0.5f;
@ -926,22 +893,14 @@ float SV_Submerged(edict_t *ent)
} }
return 0; return 0;
} /* size: 4 */ }
/* // Non moving objects can only think.
=============
SV_Physics_None
Non moving objects can only think.
=============
*/
/* <b62ae> ../engine/sv_phys.c:1389 */
void SV_Physics_None(edict_t *ent) void SV_Physics_None(edict_t *ent)
{ {
SV_RunThink(ent); SV_RunThink(ent);
} }
/* <b6335> ../engine/sv_phys.c:1402 */
void SV_Physics_Follow(edict_t *ent) void SV_Physics_Follow(edict_t *ent)
{ {
if (SV_RunThink(ent)) if (SV_RunThink(ent))
@ -962,9 +921,8 @@ void SV_Physics_Follow(edict_t *ent)
ent->v.movetype = 0; ent->v.movetype = 0;
} }
} }
} /* size: 0 */ }
/* <b63ac> ../engine/sv_phys.c:1430 */
void SV_Physics_Noclip(edict_t *ent) void SV_Physics_Noclip(edict_t *ent)
{ {
if (SV_RunThink(ent)) if (SV_RunThink(ent))
@ -973,13 +931,11 @@ void SV_Physics_Noclip(edict_t *ent)
VectorMA(ent->v.origin, (float)host_frametime, ent->v.velocity, ent->v.origin); VectorMA(ent->v.origin, (float)host_frametime, ent->v.velocity, ent->v.origin);
SV_LinkEdict(ent, 0); SV_LinkEdict(ent, 0);
} }
} /* size: 0 */ }
/* <b6423> ../engine/sv_phys.c:1456 */
void SV_CheckWaterTransition(edict_t *ent) void SV_CheckWaterTransition(edict_t *ent)
{ {
// int cont; // 1458 vec3_t point;
vec3_t point; // 1460
g_groupmask = ent->v.groupinfo; g_groupmask = ent->v.groupinfo;
point[0] = (ent->v.absmax[0] + ent->v.absmin[0]) * 0.5f; point[0] = (ent->v.absmax[0] + ent->v.absmin[0]) * 0.5f;
@ -1033,10 +989,8 @@ void SV_CheckWaterTransition(edict_t *ent)
ent->v.waterlevel = 3; ent->v.waterlevel = 3;
} }
} }
} }
/* <b646c> ../engine/sv_phys.c:1531 */
void SV_Physics_Toss(edict_t *ent) void SV_Physics_Toss(edict_t *ent)
{ {
SV_CheckWater(ent); SV_CheckWater(ent);
@ -1063,7 +1017,7 @@ void SV_Physics_Toss(edict_t *ent)
ent->v.velocity[1] = ent->v.basevelocity[1] + ent->v.velocity[1]; ent->v.velocity[1] = ent->v.basevelocity[1] + ent->v.velocity[1];
ent->v.velocity[2] = ent->v.basevelocity[2] + ent->v.velocity[2]; ent->v.velocity[2] = ent->v.basevelocity[2] + ent->v.velocity[2];
SV_CheckVelocity(ent); SV_CheckVelocity(ent);
vec3_t move; vec3_t move;
VectorScale(ent->v.velocity, (float)host_frametime, move); VectorScale(ent->v.velocity, (float)host_frametime, move);
ent->v.velocity[0] = ent->v.velocity[0] - ent->v.basevelocity[0]; ent->v.velocity[0] = ent->v.velocity[0] - ent->v.basevelocity[0];
@ -1144,10 +1098,7 @@ void SV_Physics_Toss(edict_t *ent)
ent->v.avelocity[1] = vec3_origin[1]; ent->v.avelocity[1] = vec3_origin[1];
ent->v.avelocity[2] = vec3_origin[2]; ent->v.avelocity[2] = vec3_origin[2];
SV_CheckWaterTransition(ent); SV_CheckWaterTransition(ent);
} /* size: 3408000 */ }
/* <b655d> ../engine/sv_phys.c:1668 */
void PF_WaterMove(edict_t *pSelf) void PF_WaterMove(edict_t *pSelf)
{ {
@ -1220,8 +1171,8 @@ void PF_WaterMove(edict_t *pSelf)
if (!(flags & (FL_IMMUNE_LAVA | FL_GODMODE)) && pSelf->v.dmgtime < g_psv.time) if (!(flags & (FL_IMMUNE_LAVA | FL_GODMODE)) && pSelf->v.dmgtime < g_psv.time)
{ {
if (g_psv.time <= pSelf->v.radsuit_finished) if (g_psv.time <= pSelf->v.radsuit_finished)
pSelf->v.dmgtime = (float)(g_psv.time + 1.0); pSelf->v.dmgtime = (float)(g_psv.time + 1.0);
else else
pSelf->v.dmgtime = (float)(g_psv.time + 0.2); pSelf->v.dmgtime = (float)(g_psv.time + 0.2);
} }
} }
@ -1269,7 +1220,6 @@ void PF_WaterMove(edict_t *pSelf)
} }
/* <b65c7> ../engine/sv_phys.c:1812 */
void SV_Physics_Step(edict_t *ent) void SV_Physics_Step(edict_t *ent)
{ {
vec3_t maxs; vec3_t maxs;
@ -1365,9 +1315,8 @@ void SV_Physics_Step(edict_t *ent)
} }
SV_RunThink(ent); SV_RunThink(ent);
SV_CheckWaterTransition(ent); SV_CheckWaterTransition(ent);
} /* size: 168162184 */ }
/* <b6864> ../engine/sv_phys.c:1976 */
void SV_Physics(void) void SV_Physics(void)
{ {
gGlobalVariables.time = (float)g_psv.time; gGlobalVariables.time = (float)g_psv.time;
@ -1446,12 +1395,11 @@ void SV_Physics(void)
if (ent->v.flags & FL_KILLME) if (ent->v.flags & FL_KILLME)
ED_Free(ent); ED_Free(ent);
} }
if (gGlobalVariables.force_retouch != 0.0f) if (gGlobalVariables.force_retouch != 0.0f)
gGlobalVariables.force_retouch = gGlobalVariables.force_retouch - 1.0f; gGlobalVariables.force_retouch = gGlobalVariables.force_retouch - 1.0f;
} /* size: 0 */ }
/* <b691d> ../engine/sv_phys.c:2068 */
trace_t SV_Trace_Toss(edict_t *ent, edict_t *ignore) trace_t SV_Trace_Toss(edict_t *ent, edict_t *ignore)
{ {
edict_t tempent; edict_t tempent;
@ -1478,8 +1426,11 @@ trace_t SV_Trace_Toss(edict_t *ent, edict_t *ignore)
tempent.v.origin[1] = trace.endpos[1]; tempent.v.origin[1] = trace.endpos[1];
tempent.v.origin[0] = trace.endpos[0]; tempent.v.origin[0] = trace.endpos[0];
tempent.v.origin[2] = trace.endpos[2]; tempent.v.origin[2] = trace.endpos[2];
} while (!trace.ent); }
} while (trace.ent == ignore); while (!trace.ent);
}
while (trace.ent == ignore);
host_frametime = save_frametime; host_frametime = save_frametime;
return trace; return trace;
} /* size: 56 */ }

6
rehlds/engine/sv_pmove.cpp
View File

@ -28,20 +28,16 @@
#include "precompiled.h" #include "precompiled.h"
void PM_SV_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)
/* <b1cb4> ../engine/sv_pmove.c:12 */
void PM_SV_PlaybackEventFull(int flags, int clientindex, short unsigned int eventindex, float delay, float *origin, float *angles, float fparam1, float fparam2, int iparam1, int iparam2, int bparam1, int bparam2)
{ {
EV_SV_Playback(flags | FEV_NOTHOST, clientindex, eventindex, delay, origin, angles, fparam1, fparam2, iparam1, iparam2, bparam1, bparam2); EV_SV_Playback(flags | FEV_NOTHOST, clientindex, eventindex, delay, origin, angles, fparam1, fparam2, iparam1, iparam2, bparam1, bparam2);
} }
/* <b1d75> ../engine/sv_pmove.c:25 */
void PM_SV_PlaySound(int channel, const char *sample, float volume, float attenuation, int fFlags, int pitch) void PM_SV_PlaySound(int channel, const char *sample, float volume, float attenuation, int fFlags, int pitch)
{ {
SV_StartSound(1, host_client->edict, channel, sample, (int)(volume * 255.0), attenuation, fFlags, pitch); SV_StartSound(1, host_client->edict, channel, sample, (int)(volume * 255.0), attenuation, fFlags, pitch);
} }
/* <b1de3> ../engine/sv_pmove.c:38 */
const char *PM_SV_TraceTexture(int ground, vec_t *vstart, vec_t *vend) const char *PM_SV_TraceTexture(int ground, vec_t *vstart, vec_t *vend)
{ {
if (ground < 0 || ground >= pmove->numphysent) if (ground < 0 || ground >= pmove->numphysent)

3
rehlds/engine/sv_pmove.h
View File

@ -34,8 +34,7 @@
#include "maintypes.h" #include "maintypes.h"
void PM_SV_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_SV_PlaybackEventFull(int flags, int clientindex, short unsigned int eventindex, float delay, float *origin, float *angles, float fparam1, float fparam2, int iparam1, int iparam2, int bparam1, int bparam2);
void PM_SV_PlaySound(int channel, const char *sample, float volume, float attenuation, int fFlags, int pitch); void PM_SV_PlaySound(int channel, const char *sample, float volume, float attenuation, int fFlags, int pitch);
const char *PM_SV_TraceTexture(int ground, vec_t *vstart, vec_t *vend); const char *PM_SV_TraceTexture(int ground, vec_t *vstart, vec_t *vend);

19
rehlds/engine/sv_remoteaccess.h
View File

@ -27,14 +27,12 @@
*/ */
#pragma once #pragma once
#include "maintypes.h" #include "maintypes.h"
#include "IGameServerData.h" #include "IGameServerData.h"
#include "utlbuffer.h" #include "utlbuffer.h"
#include "utllinkedlist.h" #include "utllinkedlist.h"
class CServerRemoteAccess: public IGameServerData {
class CServerRemoteAccess : public IGameServerData {
public: public:
struct DataResponse_t { struct DataResponse_t {
CUtlBuffer packet; CUtlBuffer packet;
@ -42,13 +40,13 @@ public:
private: private:
CUtlLinkedList<DataResponse_t, int> m_ResponsePackets; CUtlLinkedList<DataResponse_t, int> m_ResponsePackets;
int m_iBytesSent; int m_iBytesSent;
int m_iBytesReceived; int m_iBytesReceived;
public: public:
CServerRemoteAccess(); CServerRemoteAccess();
virtual ~CServerRemoteAccess() { } virtual ~CServerRemoteAccess() {}
virtual void WriteDataRequest(const void *buffer, int bufferSize); virtual void WriteDataRequest(const void *buffer, int bufferSize);
virtual int ReadDataResponse(void *data, int len); virtual int ReadDataResponse(void *data, int len);
@ -57,25 +55,16 @@ public:
int ReadDataResponse_noVirt(void *data, int len); int ReadDataResponse_noVirt(void *data, int len);
void SendMessageToAdminUI(const char *message); void SendMessageToAdminUI(const char *message);
void RequestValue(int requestID, const char *variable); void RequestValue(int requestID, const char *variable);
void SetValue(const char *variable, const char *value); void SetValue(const char *variable, const char *value);
void ExecCommand(const char *cmdString); void ExecCommand(const char *cmdString);
bool LookupValue(const char *variable, CUtlBuffer &value); bool LookupValue(const char *variable, CUtlBuffer &value);
const char* LookupStringValue(const char *variable); const char* LookupStringValue(const char *variable);
void GetUserBanList(CUtlBuffer &value); void GetUserBanList(CUtlBuffer &value);
void GetPlayerList(CUtlBuffer &value); void GetPlayerList(CUtlBuffer &value);
void GetMapList(CUtlBuffer &value); void GetMapList(CUtlBuffer &value);
}; };
#ifdef HOOK_ENGINE #ifdef HOOK_ENGINE
#define g_ServerRemoteAccess (*pg_ServerRemoteAccess) #define g_ServerRemoteAccess (*pg_ServerRemoteAccess)
#endif #endif

115
rehlds/engine/sv_steam3.cpp
View File

@ -28,11 +28,8 @@
#include "precompiled.h" #include "precompiled.h"
bool (CSteam3Server::*pNotifyClientConnect)(client_t *client, const void *pvSteam2Key, uint32 ucbSteam2Key) = &CSteam3Server::NotifyClientConnect; bool (CSteam3Server::*pNotifyClientConnect)(client_t *client, const void *pvSteam2Key, uint32 ucbSteam2Key) = &CSteam3Server::NotifyClientConnect;
/* <ee495> ../engine/sv_steam3.cpp:81 */
void CSteam3Server::OnGSPolicyResponse(GSPolicyResponse_t *pPolicyResponse) void CSteam3Server::OnGSPolicyResponse(GSPolicyResponse_t *pPolicyResponse)
{ {
if (CRehldsPlatformHolder::get()->SteamGameServer()->BSecure()) if (CRehldsPlatformHolder::get()->SteamGameServer()->BSecure())
@ -41,7 +38,6 @@ void CSteam3Server::OnGSPolicyResponse(GSPolicyResponse_t *pPolicyResponse)
Con_Printf(" VAC secure mode disabled.\n"); Con_Printf(" VAC secure mode disabled.\n");
} }
/* <ee4b6> ../engine/sv_steam3.cpp:97 */
void CSteam3Server::OnLogonSuccess(SteamServersConnected_t *pLogonSuccess) void CSteam3Server::OnLogonSuccess(SteamServersConnected_t *pLogonSuccess)
{ {
if (m_bLogOnResult) if (m_bLogOnResult)
@ -60,7 +56,6 @@ void CSteam3Server::OnLogonSuccess(SteamServersConnected_t *pLogonSuccess)
CSteam3Server::SendUpdatedServerDetails(); CSteam3Server::SendUpdatedServerDetails();
} }
/* <ee390> ../engine/sv_steam3.cpp:128 */
uint64 CSteam3Server::GetSteamID() uint64 CSteam3Server::GetSteamID()
{ {
if (m_bLanOnly) if (m_bLanOnly)
@ -69,7 +64,6 @@ uint64 CSteam3Server::GetSteamID()
return m_SteamIDGS.ConvertToUint64(); return m_SteamIDGS.ConvertToUint64();
} }
/* <ee4d7> ../engine/sv_steam3.cpp:145 */
void CSteam3Server::OnLogonFailure(SteamServerConnectFailure_t *pLogonFailure) void CSteam3Server::OnLogonFailure(SteamServerConnectFailure_t *pLogonFailure)
{ {
if (!m_bLogOnResult) if (!m_bLogOnResult)
@ -97,7 +91,6 @@ void CSteam3Server::OnLogonFailure(SteamServerConnectFailure_t *pLogonFailure)
m_bLogOnResult = true; m_bLogOnResult = true;
} }
/* <ee452> ../engine/sv_steam3.cpp:181 */
void CSteam3Server::OnGSClientDeny(GSClientDeny_t *pGSClientDeny) void CSteam3Server::OnGSClientDeny(GSClientDeny_t *pGSClientDeny)
{ {
client_t* cl = CSteam3Server::ClientFindFromSteamID(pGSClientDeny->m_SteamID); client_t* cl = CSteam3Server::ClientFindFromSteamID(pGSClientDeny->m_SteamID);
@ -105,7 +98,6 @@ void CSteam3Server::OnGSClientDeny(GSClientDeny_t *pGSClientDeny)
OnGSClientDenyHelper(cl, pGSClientDeny->m_eDenyReason, pGSClientDeny->m_rgchOptionalText); OnGSClientDenyHelper(cl, pGSClientDeny->m_eDenyReason, pGSClientDeny->m_rgchOptionalText);
} }
/* <ee4f8> ../engine/sv_steam3.cpp:190 */
void CSteam3Server::OnGSClientDenyHelper(client_t *cl, EDenyReason eDenyReason, const char *pchOptionalText) void CSteam3Server::OnGSClientDenyHelper(client_t *cl, EDenyReason eDenyReason, const char *pchOptionalText)
{ {
switch (eDenyReason) switch (eDenyReason)
@ -176,14 +168,13 @@ void CSteam3Server::OnGSClientDenyHelper(client_t *cl, EDenyReason eDenyReason,
} }
} }
/* <ee430> ../engine/sv_steam3.cpp:290 */
void CSteam3Server::OnGSClientApprove(GSClientApprove_t *pGSClientSteam2Accept) void CSteam3Server::OnGSClientApprove(GSClientApprove_t *pGSClientSteam2Accept)
{ {
client_t* cl = ClientFindFromSteamID(pGSClientSteam2Accept->m_SteamID); client_t* cl = ClientFindFromSteamID(pGSClientSteam2Accept->m_SteamID);
if (!cl) if (!cl)
return; return;
if (SV_FilterUser(&cl->network_userid)) if (SV_FilterUser(&cl->network_userid))
{ {
char msg[256]; char msg[256];
@ -210,15 +201,13 @@ void CSteam3Server::OnGSClientApprove(GSClientApprove_t *pGSClientSteam2Accept)
} }
} }
/* <ee473> ../engine/sv_steam3.cpp:268 */ void CSteam3Server::OnGSClientKick(GSClientKick_t *pGSClientKick)
void CSteam3Server::OnGSClientKick(GSClientKick_t *pGSClientKick) /* linkage=_ZN13CSteam3Server14OnGSClientKickEP14GSClientKick_t */
{ {
client_t* cl = CSteam3Server::ClientFindFromSteamID(pGSClientKick->m_SteamID); client_t* cl = CSteam3Server::ClientFindFromSteamID(pGSClientKick->m_SteamID);
if (cl) if (cl)
CSteam3Server::OnGSClientDenyHelper(cl, pGSClientKick->m_eDenyReason, 0); CSteam3Server::OnGSClientDenyHelper(cl, pGSClientKick->m_eDenyReason, 0);
} }
/* <ee2af> ../engine/sv_steam3.cpp:333 */
client_t *CSteam3Server::ClientFindFromSteamID(CSteamID &steamIDFind) client_t *CSteam3Server::ClientFindFromSteamID(CSteamID &steamIDFind)
{ {
for (int i = 0; i < g_psvs.maxclients; i++) for (int i = 0; i < g_psvs.maxclients; i++)
@ -237,8 +226,7 @@ client_t *CSteam3Server::ClientFindFromSteamID(CSteamID &steamIDFind)
return NULL; return NULL;
} }
/* <ee21b> ../engine/sv_steam3.cpp:356 */ CSteam3Server::CSteam3Server() :
CSteam3Server::CSteam3Server(void) :
m_CallbackGSClientApprove(this, &CSteam3Server::OnGSClientApprove), m_CallbackGSClientApprove(this, &CSteam3Server::OnGSClientApprove),
m_CallbackGSClientDeny(this, &CSteam3Server::OnGSClientDeny), m_CallbackGSClientDeny(this, &CSteam3Server::OnGSClientDeny),
m_CallbackGSClientKick(this, &CSteam3Server::OnGSClientKick), m_CallbackGSClientKick(this, &CSteam3Server::OnGSClientKick),
@ -252,7 +240,6 @@ CSteam3Server::CSteam3Server(void) :
m_bLanOnly = false; m_bLanOnly = false;
} }
/* <ee234> ../engine/sv_steam3.cpp:375 */
void CSteam3Server::Activate() void CSteam3Server::Activate()
{ {
bool bLanOnly; bool bLanOnly;
@ -344,8 +331,7 @@ void CSteam3Server::Activate()
} }
} }
/* <ee28a> ../engine/sv_steam3.cpp:506 */ void CSteam3Server::Shutdown()
void CSteam3Server::Shutdown(void) /* linkage=_ZN13CSteam3Server8ShutdownEv */
{ {
if (this->m_bLoggedOn) if (this->m_bLoggedOn)
{ {
@ -357,8 +343,7 @@ void CSteam3Server::Shutdown(void) /* linkage=_ZN13CSteam3Server8ShutdownEv */
} }
} }
/* <ee2d5> ../engine/sv_steam3.cpp:537 */ bool CSteam3Server::NotifyClientConnect(client_t *client, const void *pvSteam2Key, uint32 ucbSteam2Key)
bool CSteam3Server::NotifyClientConnect(client_t *client, const void *pvSteam2Key, uint32 ucbSteam2Key) /* linkage=_ZN13CSteam3Server19NotifyClientConnectEP8client_sPKvj */
{ {
class CSteamID steamIDClient; class CSteamID steamIDClient;
bool bRet = false; bool bRet = false;
@ -374,7 +359,6 @@ bool CSteam3Server::NotifyClientConnect(client_t *client, const void *pvSteam2Ke
return bRet; return bRet;
} }
/* <ee327> ../engine/sv_steam3.cpp:578 */
bool CSteam3Server::NotifyBotConnect(client_t *client) bool CSteam3Server::NotifyBotConnect(client_t *client)
{ {
if (client == NULL || !m_bLoggedOn) if (client == NULL || !m_bLoggedOn)
@ -386,7 +370,6 @@ bool CSteam3Server::NotifyBotConnect(client_t *client)
return true; return true;
} }
/* <ee305> ../engine/sv_steam3.cpp:596 */
void CSteam3Server::NotifyClientDisconnect(client_t *cl) void CSteam3Server::NotifyClientDisconnect(client_t *cl)
{ {
if (!cl || !m_bLoggedOn) if (!cl || !m_bLoggedOn)
@ -398,7 +381,6 @@ void CSteam3Server::NotifyClientDisconnect(client_t *cl)
} }
} }
/* <ee34d> ../engine/sv_steam3.cpp:616 */
void CSteam3Server::NotifyOfLevelChange(bool bForce) void CSteam3Server::NotifyOfLevelChange(bool bForce)
{ {
SendUpdatedServerDetails(); SendUpdatedServerDetails();
@ -427,7 +409,6 @@ void CSteam3Server::NotifyOfLevelChange(bool bForce)
} }
} }
/* <ee251> ../engine/sv_steam3.cpp:664 */
void CSteam3Server::RunFrame() void CSteam3Server::RunFrame()
{ {
bool bHasPlayers; bool bHasPlayers;
@ -516,7 +497,6 @@ void CSteam3Server::RunFrame()
} }
} }
/* <ee524> ../engine/sv_steam3.cpp:777 */
void CSteam3Server::SendUpdatedServerDetails() void CSteam3Server::SendUpdatedServerDetails()
{ {
int botCount = 0; int botCount = 0;
@ -542,8 +522,7 @@ void CSteam3Server::SendUpdatedServerDetails()
} }
/* <ed9d6> ../engine/sv_steam3.cpp:523 */ void CSteam3Client::Shutdown()
void CSteam3Client::Shutdown(void) /* linkage=_ZN13CSteam3Client8ShutdownEv */
{ {
if (this->m_bLoggedOn) if (this->m_bLoggedOn)
{ {
@ -552,19 +531,16 @@ void CSteam3Client::Shutdown(void) /* linkage=_ZN13CSteam3Client8ShutdownEv */
} }
} }
/* <ed9fb> ../engine/sv_steam3.cpp:816 */
int CSteam3Client::InitiateGameConnection(void *pData, int cbMaxData, uint64 steamID, uint32 unIPServer, uint16 usPortServer, bool bSecure) int CSteam3Client::InitiateGameConnection(void *pData, int cbMaxData, uint64 steamID, uint32 unIPServer, uint16 usPortServer, bool bSecure)
{ {
return SteamUser()->InitiateGameConnection(pData, cbMaxData, CSteamID(steamID), ntohl(unIPServer), ntohs(usPortServer), bSecure); return SteamUser()->InitiateGameConnection(pData, cbMaxData, CSteamID(steamID), ntohl(unIPServer), ntohs(usPortServer), bSecure);
} }
/* <eda3a> ../engine/sv_steam3.cpp:822 */
void CSteam3Client::TerminateConnection(uint32 unIPServer, uint16 usPortServer) void CSteam3Client::TerminateConnection(uint32 unIPServer, uint16 usPortServer)
{ {
SteamUser()->TerminateGameConnection(ntohl(unIPServer), ntohs(usPortServer)); SteamUser()->TerminateGameConnection(ntohl(unIPServer), ntohs(usPortServer));
} }
/* <ed99c> ../engine/sv_steam3.cpp:827 */
void CSteam3Client::InitClient() void CSteam3Client::InitClient()
{ {
if (m_bLoggedOn) if (m_bLoggedOn)
@ -592,15 +568,13 @@ void CSteam3Client::InitClient()
m_bLogOnResult = false; m_bLogOnResult = false;
} }
/* <eda61> ../engine/sv_steam3.cpp:864 */ void CSteam3Client::OnClientGameServerDeny(ClientGameServerDeny_t *pClientGameServerDeny)
void CSteam3Client::OnClientGameServerDeny(ClientGameServerDeny_t *pClientGameServerDeny) /* linkage=_ZN13CSteam3Client22OnClientGameServerDenyEP22ClientGameServerDeny_t */
{ {
COM_ExplainDisconnection(TRUE, "Invalid server version, unable to connect."); COM_ExplainDisconnection(TRUE, "Invalid server version, unable to connect.");
CL_Disconnect(); CL_Disconnect();
} }
/* <eda83> ../engine/sv_steam3.cpp:874 */ void CSteam3Client::OnGameServerChangeRequested(GameServerChangeRequested_t *pGameServerChangeRequested)
void CSteam3Client::OnGameServerChangeRequested(GameServerChangeRequested_t *pGameServerChangeRequested) /* linkage=_ZN13CSteam3Client27OnGameServerChangeRequestedEP27GameServerChangeRequested_t */
{ {
#ifndef SWDS #ifndef SWDS
char *cmd; char *cmd;
@ -612,8 +586,7 @@ void CSteam3Client::OnGameServerChangeRequested(GameServerChangeRequested_t *pGa
#endif #endif
} }
/* <edaa5> ../engine/sv_steam3.cpp:887 */ void CSteam3Client::OnGameOverlayActivated(GameOverlayActivated_t *pGameOverlayActivated)
void CSteam3Client::OnGameOverlayActivated(GameOverlayActivated_t *pGameOverlayActivated) /* linkage=_ZN13CSteam3Client22OnGameOverlayActivatedEP22GameOverlayActivated_t */
{ {
#ifndef SWDS #ifndef SWDS
if (Host_IsSinglePlayerGame()) if (Host_IsSinglePlayerGame())
@ -624,7 +597,7 @@ void CSteam3Client::OnGameOverlayActivated(GameOverlayActivated_t *pGameOverlayA
} }
else else
{ {
if (!(unsigned __int8)(*(int(**)(void))(*(_DWORD *)g_pGameUI007 + 44))()) if (!(unsigned __int8)(*(int(**)())(*(_DWORD *)g_pGameUI007 + 44))())
{ {
Cbuf_AddText("unpause;"); Cbuf_AddText("unpause;");
} }
@ -633,15 +606,12 @@ void CSteam3Client::OnGameOverlayActivated(GameOverlayActivated_t *pGameOverlayA
#endif #endif
} }
/* <ed9b9> ../engine/sv_steam3.cpp:905 */ void CSteam3Client::RunFrame()
void CSteam3Client::RunFrame(void) /* linkage=_ZN13CSteam3Client8RunFrameEv */
{ {
CRehldsPlatformHolder::get()->SteamAPI_RunCallbacks(); CRehldsPlatformHolder::get()->SteamAPI_RunCallbacks();
} }
uint64 ISteamGameServer_CreateUnauthenticatedUserConnection()
/* <f108b> ../engine/sv_steam3.cpp:552 */
uint64 ISteamGameServer_CreateUnauthenticatedUserConnection(void)
{ {
if (!CRehldsPlatformHolder::get()->SteamGameServer()) if (!CRehldsPlatformHolder::get()->SteamGameServer())
{ {
@ -656,7 +626,6 @@ bool Steam_GSBUpdateUserData(uint64 steamIDUser, const char *pchPlayerName, uint
return CRehldsPlatformHolder::get()->SteamGameServer()->BUpdateUserData(steamIDUser, pchPlayerName, uScore); return CRehldsPlatformHolder::get()->SteamGameServer()->BUpdateUserData(steamIDUser, pchPlayerName, uScore);
} }
/* <f10a4> ../engine/sv_steam3.cpp:559 */
bool ISteamGameServer_BUpdateUserData(uint64 steamid, const char *netname, uint32 score) bool ISteamGameServer_BUpdateUserData(uint64 steamid, const char *netname, uint32 score)
{ {
if (!CRehldsPlatformHolder::get()->SteamGameServer()) if (!CRehldsPlatformHolder::get()->SteamGameServer())
@ -667,7 +636,6 @@ bool ISteamGameServer_BUpdateUserData(uint64 steamid, const char *netname, uint3
return g_RehldsHookchains.m_Steam_GSBUpdateUserData.callChain(Steam_GSBUpdateUserData, steamid, netname, score); return g_RehldsHookchains.m_Steam_GSBUpdateUserData.callChain(Steam_GSBUpdateUserData, steamid, netname, score);
} }
/* <f10ef> ../engine/sv_steam3.cpp:566 */
bool ISteamApps_BIsSubscribedApp(uint32 appid) bool ISteamApps_BIsSubscribedApp(uint32 appid)
{ {
if (CRehldsPlatformHolder::get()->SteamApps()) if (CRehldsPlatformHolder::get()->SteamApps())
@ -679,7 +647,6 @@ bool ISteamApps_BIsSubscribedApp(uint32 appid)
return false; return false;
} }
/* <f1608> ../engine/sv_steam3.cpp:805 */
const char *Steam_GetCommunityName() const char *Steam_GetCommunityName()
{ {
if (SteamFriends()) if (SteamFriends())
@ -699,7 +666,6 @@ qboolean Steam_NotifyClientConnect(client_t *cl, const void *pvSteam2Key, unsign
.callChain(Steam_NotifyClientConnect_api, GetRehldsApiClient(cl), pvSteam2Key, ucbSteam2Key); .callChain(Steam_NotifyClientConnect_api, GetRehldsApiClient(cl), pvSteam2Key, ucbSteam2Key);
} }
/* <f1884> ../engine/sv_steam3.cpp:914 */
qboolean Steam_NotifyClientConnect_internal(client_t *cl, const void *pvSteam2Key, unsigned int ucbSteam2Key) qboolean Steam_NotifyClientConnect_internal(client_t *cl, const void *pvSteam2Key, unsigned int ucbSteam2Key)
{ {
if (Steam3Server()) if (Steam3Server())
@ -719,7 +685,6 @@ qboolean Steam_NotifyBotConnect(client_t *cl)
return g_RehldsHookchains.m_Steam_NotifyBotConnect.callChain(Steam_NotifyBotConnect_api, GetRehldsApiClient(cl)); return g_RehldsHookchains.m_Steam_NotifyBotConnect.callChain(Steam_NotifyBotConnect_api, GetRehldsApiClient(cl));
} }
/* <f18cf> ../engine/sv_steam3.cpp:924 */
qboolean Steam_NotifyBotConnect_internal(client_t *cl) qboolean Steam_NotifyBotConnect_internal(client_t *cl)
{ {
if (Steam3Server()) if (Steam3Server())
@ -739,7 +704,6 @@ void Steam_NotifyClientDisconnect(client_t *cl)
Steam_NotifyClientDisconnect_api(GetRehldsApiClient(cl)); Steam_NotifyClientDisconnect_api(GetRehldsApiClient(cl));
} }
/* <f191f> ../engine/sv_steam3.cpp:934 */
void Steam_NotifyClientDisconnect_internal(IGameClient* cl) void Steam_NotifyClientDisconnect_internal(IGameClient* cl)
{ {
if (Steam3Server()) if (Steam3Server())
@ -748,8 +712,7 @@ void Steam_NotifyClientDisconnect_internal(IGameClient* cl)
} }
} }
/* <f19a2> ../engine/sv_steam3.cpp:944 */ void Steam_NotifyOfLevelChange()
void Steam_NotifyOfLevelChange(void)
{ {
if (Steam3Server()) if (Steam3Server())
{ {
@ -757,8 +720,7 @@ void Steam_NotifyOfLevelChange(void)
} }
} }
/* <f19b8> ../engine/sv_steam3.cpp:955 */ void Steam_Shutdown()
void Steam_Shutdown(void)
{ {
if (Steam3Server()) if (Steam3Server())
{ {
@ -768,8 +730,7 @@ void Steam_Shutdown(void)
} }
} }
/* <f19ce> ../engine/sv_steam3.cpp:965 */ void Steam_Activate()
void Steam_Activate(void)
{ {
if (!Steam3Server()) if (!Steam3Server())
{ {
@ -781,8 +742,7 @@ void Steam_Activate(void)
Steam3Server()->Activate(); Steam3Server()->Activate();
} }
/* <f19e4> ../engine/sv_steam3.cpp:975 */ void Steam_RunFrame()
void Steam_RunFrame(void)
{ {
if (Steam3Server()) if (Steam3Server())
{ {
@ -790,7 +750,6 @@ void Steam_RunFrame(void)
} }
} }
/* <f19fa> ../engine/sv_steam3.cpp:986 */
void Steam_SetCVar(const char *pchKey, const char *pchValue) void Steam_SetCVar(const char *pchKey, const char *pchValue)
{ {
if (Steam3Server()) if (Steam3Server())
@ -799,63 +758,53 @@ void Steam_SetCVar(const char *pchKey, const char *pchValue)
} }
} }
/* <f1a33> ../engine/sv_steam3.cpp:996 */
void Steam_ClientRunFrame() void Steam_ClientRunFrame()
{ {
Steam3Client()->RunFrame(); Steam3Client()->RunFrame();
} }
/* <f1a6a> ../engine/sv_steam3.cpp:1002 */ void Steam_InitClient()
void Steam_InitClient(void)
{ {
Steam3Client()->InitClient(); Steam3Client()->InitClient();
} }
/* <f1ace> ../engine/sv_steam3.cpp:1007 */
int Steam_GSInitiateGameConnection(void *pData, int cbMaxData, uint64 steamID, uint32 unIPServer, uint16 usPortServer, qboolean bSecure) int Steam_GSInitiateGameConnection(void *pData, int cbMaxData, uint64 steamID, uint32 unIPServer, uint16 usPortServer, qboolean bSecure)
{ {
return Steam3Client()->InitiateGameConnection(pData, cbMaxData, steamID, unIPServer, usPortServer, bSecure != 0); return Steam3Client()->InitiateGameConnection(pData, cbMaxData, steamID, unIPServer, usPortServer, bSecure != 0);
} }
/* <f1bd1> ../engine/sv_steam3.cpp:1013 */
void Steam_GSTerminateGameConnection(uint32 unIPServer, uint16 usPortServer) void Steam_GSTerminateGameConnection(uint32 unIPServer, uint16 usPortServer)
{ {
Steam3Client()->TerminateConnection(unIPServer, usPortServer); Steam3Client()->TerminateConnection(unIPServer, usPortServer);
} }
/* <f1c70> ../engine/sv_steam3.cpp:1019 */ void Steam_ShutdownClient()
void Steam_ShutdownClient(void)
{ {
Steam3Client()->Shutdown(); Steam3Client()->Shutdown();
} }
/* <f1c86> ../engine/sv_steam3.cpp:1026 */
uint64 Steam_GSGetSteamID() uint64 Steam_GSGetSteamID()
{ {
return Steam3Server()->GetSteamID(); return Steam3Server()->GetSteamID();
} }
/* <f1d2a> ../engine/sv_steam3.cpp:1031 */ qboolean Steam_GSBSecure()
qboolean Steam_GSBSecure(void)
{ {
//useless call //useless call
//Steam3Server(); //Steam3Server();
return CRehldsPlatformHolder::get()->SteamGameServer()->BSecure(); return CRehldsPlatformHolder::get()->SteamGameServer()->BSecure();
} }
/* <f1d59> ../engine/sv_steam3.cpp:1036 */ qboolean Steam_GSBLoggedOn()
qboolean Steam_GSBLoggedOn(void) {
{
return Steam3Server()->BLoggedOn() && CRehldsPlatformHolder::get()->SteamGameServer()->BLoggedOn(); return Steam3Server()->BLoggedOn() && CRehldsPlatformHolder::get()->SteamGameServer()->BLoggedOn();
} }
/* <f1d88> ../engine/sv_steam3.cpp:1041 */ qboolean Steam_GSBSecurePreference()
qboolean Steam_GSBSecurePreference(void)
{ {
return Steam3Server()->BWantsSecure(); return Steam3Server()->BWantsSecure();
} }
/* <f1da1> ../engine/sv_steam3.cpp:1046 */
TSteamGlobalUserID Steam_Steam3IDtoSteam2(uint64 unSteamID) TSteamGlobalUserID Steam_Steam3IDtoSteam2(uint64 unSteamID)
{ {
class CSteamID steamID = unSteamID; class CSteamID steamID = unSteamID;
@ -864,7 +813,6 @@ TSteamGlobalUserID Steam_Steam3IDtoSteam2(uint64 unSteamID)
return steam2ID; return steam2ID;
} }
/* <f1e63> ../engine/sv_steam3.cpp:1054 */
uint64 Steam_StringToSteamID(const char *pStr) uint64 Steam_StringToSteamID(const char *pStr)
{ {
CSteamID steamID; CSteamID steamID;
@ -881,8 +829,7 @@ uint64 Steam_StringToSteamID(const char *pStr)
return steamID.ConvertToUint64(); return steamID.ConvertToUint64();
} }
/* <f1f49> ../engine/sv_steam3.cpp:1065 */ const char *Steam_GetGSUniverse()
const char *Steam_GetGSUniverse(void)
{ {
CSteamID steamID(Steam3Server()->GetSteamID()); CSteamID steamID(Steam3Server()->GetSteamID());
switch (steamID.GetEUniverse()) switch (steamID.GetEUniverse())
@ -901,25 +848,20 @@ const char *Steam_GetGSUniverse(void)
} }
} }
CSteam3Server *s_Steam3Server;
CSteam3Client s_Steam3Client;
CSteam3Server *s_Steam3Server; // static CSteam3Server *Steam3Server()
/* <ef565> ../engine/sv_steam3.cpp:1085 */
CSteam3Server *Steam3Server(void)
{ {
return s_Steam3Server; return s_Steam3Server;
} }
CSteam3Client s_Steam3Client; // static CSteam3Client *Steam3Client()
/* <ef58c> ../engine/sv_steam3.cpp:1096 */
CSteam3Client *Steam3Client(void)
{ {
return &s_Steam3Client; return &s_Steam3Client;
} }
/* <f2083> ../engine/sv_steam3.cpp:1102 */ void Master_SetMaster_f()
void Master_SetMaster_f(void)
{ {
int i; int i;
const char * pszCmd; const char * pszCmd;
@ -960,7 +902,6 @@ void Master_SetMaster_f(void)
} }
} }
/* <f20d0> ../engine/sv_steam3.cpp:1143 */
void Steam_HandleIncomingPacket(byte *data, int len, int fromip, uint16 port) void Steam_HandleIncomingPacket(byte *data, int len, int fromip, uint16 port)
{ {
CRehldsPlatformHolder::get()->SteamGameServer()->HandleIncomingPacket(data, len, fromip, port); CRehldsPlatformHolder::get()->SteamGameServer()->HandleIncomingPacket(data, len, fromip, port);

168
rehlds/engine/sv_steam3.h
View File

@ -40,39 +40,25 @@
#include "public/steam/steamclientpublic.h" #include "public/steam/steamclientpublic.h"
#include "server.h" #include "server.h"
class CSteamID;
/* <edae6> ../engine/sv_steam3.h:21 */
class CSteam3 class CSteam3
{ {
public: // TODO: Make protected after all (it is set public for testing purpouses) protected:
bool m_bLoggedOn; bool m_bLoggedOn;
bool m_bLogOnResult; bool m_bLogOnResult;
HSteamPipe m_hSteamPipe; HSteamPipe m_hSteamPipe;
protected: protected:
/* <edb4c> ../engine/sv_steam3.h:24 */ CSteam3() : m_bLoggedOn(false), m_bLogOnResult(false), m_hSteamPipe(0) {}
CSteam3(void) {
m_bLoggedOn = false;
m_bLogOnResult = false;
m_hSteamPipe = 0;
}
/* <edb64> ../engine/sv_steam3.h:32 */ virtual ~CSteam3() {}
virtual ~CSteam3(void) { } virtual void Shutdown() = 0;
/* <edb87> ../engine/sv_steam3.h:38 */ void GSSendUserStatusResponse(CSteamID &, int, int);
virtual void Shutdown(void) = 0; /* linkage=_ZN7CSteam38ShutdownEv */ bool InitModule();
/* <edbab> ../engine/sv_steam3.h:40 */
void GSSendUserStatusResponse(class CSteamID &, int, int); /* linkage=_ZN7CSteam324GSSendUserStatusResponseER8CSteamIDii */
/* <edbd6> ../engine/sv_steam3.h:43 */
bool InitModule(void); /* linkage=_ZN7CSteam310InitModuleEv */
}; };
/* <ee151> ../engine/sv_steam3.h:52 */ class CSteam3Server: public CSteam3
class CSteam3Server : public CSteam3
{ {
public: public:
@ -83,7 +69,7 @@ public:
STEAM_GAMESERVER_CALLBACK(CSteam3Server, OnLogonSuccess, SteamServersConnected_t, m_CallbackLogonSuccess); STEAM_GAMESERVER_CALLBACK(CSteam3Server, OnLogonSuccess, SteamServersConnected_t, m_CallbackLogonSuccess);
STEAM_GAMESERVER_CALLBACK(CSteam3Server, OnLogonFailure, SteamServerConnectFailure_t, m_CallbackLogonFailure); STEAM_GAMESERVER_CALLBACK(CSteam3Server, OnLogonFailure, SteamServerConnectFailure_t, m_CallbackLogonFailure);
public: // TODO: Make protected after all (it is set public for testing purpouses) protected:
bool m_bHasActivePlayers; bool m_bHasActivePlayers;
bool m_bWantToBeSecure; bool m_bWantToBeSecure;
bool m_bLanOnly; bool m_bLanOnly;
@ -91,116 +77,66 @@ public: // TODO: Make protected after all (it is set public for testing purpous
public: public:
/* <ee26e> ../engine/sv_steam3.h:58 */ NOBODY void SetServerType();
NOBODY void SetServerType(void); /* linkage=_ZN13CSteam3Server13SetServerTypeEv */ NOBODY void SetSpawnCount(int count);
NOBODY bool BSecure();
NOBODY bool BLanOnly();
/* <ee36f> ../engine/sv_steam3.h:68 */ bool BWantsSecure() { return m_bWantToBeSecure; }
NOBODY void SetSpawnCount(int count); /* linkage=_ZN13CSteam3Server13SetSpawnCountEi */ bool BLoggedOn() { return m_bLoggedOn; }
/* <ee3b0> ../engine/sv_steam3.h:72 */ uint64 GetSteamID();
NOBODY bool BSecure(void); /* linkage=_ZNK13CSteam3Server7BSecureEv */
/* <ee3d0> ../engine/sv_steam3.h:73 */ void OnGSClientDenyHelper(client_t *cl, EDenyReason eDenyReason, const char *pchOptionalText);
NOBODY bool BLanOnly(void); /* linkage=_ZNK13CSteam3Server8BLanOnlyEv */ client_t *ClientFindFromSteamID(class CSteamID &steamIDFind);
/* <ee3f0> ../engine/sv_steam3.h:74 */ CSteam3Server();
bool BWantsSecure(void)
{
return m_bWantToBeSecure;
}
/* <ee410> ../engine/sv_steam3.h:75 */ void Activate();
bool BLoggedOn(void) virtual void Shutdown();
{ bool NotifyClientConnect(client_t *client, const void *pvSteam2Key, uint32 ucbSteam2Key);
return m_bLoggedOn; bool NotifyBotConnect(client_t *client);
} void NotifyClientDisconnect(client_t *cl);
void NotifyOfLevelChange(bool bForce);
/* <ee390> ../engine/sv_steam3.cpp:128 */ void RunFrame();
uint64 GetSteamID(void); /* linkage=_ZN13CSteam3Server10GetSteamIDEv */ void SendUpdatedServerDetails();
/* <ee4f8> ../engine/sv_steam3.cpp:190 */
void OnGSClientDenyHelper(client_t *cl, EDenyReason eDenyReason, const char *pchOptionalText); /* linkage=_ZN13CSteam3Server20OnGSClientDenyHelperEP8client_s11EDenyReasonPKc */
/* <ee2af> ../engine/sv_steam3.cpp:333 */
client_t *ClientFindFromSteamID(class CSteamID &steamIDFind); /* linkage=_ZN13CSteam3Server21ClientFindFromSteamIDER8CSteamID */
/* <ee21b> ../engine/sv_steam3.cpp:356 */
CSteam3Server(void);
/* <ee234> ../engine/sv_steam3.cpp:375 */
void Activate(void); /* linkage=_ZN13CSteam3Server8ActivateEv */
/* <ee28a> ../engine/sv_steam3.cpp:506 */
virtual void Shutdown(void); /* linkage=_ZN13CSteam3Server8ShutdownEv */
/* <ee2d5> ../engine/sv_steam3.cpp:537 */
bool NotifyClientConnect(client_t *client, const void *pvSteam2Key, uint32 ucbSteam2Key); /* linkage=_ZN13CSteam3Server19NotifyClientConnectEP8client_sPKvj */
/* <ee327> ../engine/sv_steam3.cpp:578 */
bool NotifyBotConnect(client_t *client); /* linkage=_ZN13CSteam3Server16NotifyBotConnectEP8client_s */
/* <ee305> ../engine/sv_steam3.cpp:596 */
void NotifyClientDisconnect(client_t *cl); /* linkage=_ZN13CSteam3Server22NotifyClientDisconnectEP8client_s */
/* <ee34d> ../engine/sv_steam3.cpp:616 */
void NotifyOfLevelChange(bool bForce); /* linkage=_ZN13CSteam3Server19NotifyOfLevelChangeEb */
/* <ee251> ../engine/sv_steam3.cpp:664 */
void RunFrame(void); /* linkage=_ZN13CSteam3Server8RunFrameEv */
/* <ee524> ../engine/sv_steam3.cpp:777 */
void SendUpdatedServerDetails(void); /* linkage=_ZN13CSteam3Server24SendUpdatedServerDetailsEv */
}; };
/* <ed925> ../engine/sv_steam3.h:101 */ class CSteam3Client: public CSteam3
class CSteam3Client : public CSteam3
{ {
public: public:
STEAM_CALLBACK(CSteam3Client, OnClientGameServerDeny, ClientGameServerDeny_t, m_CallbackClientGameServerDeny); STEAM_CALLBACK(CSteam3Client, OnClientGameServerDeny, ClientGameServerDeny_t, m_CallbackClientGameServerDeny);
STEAM_CALLBACK(CSteam3Client, OnGameServerChangeRequested, GameServerChangeRequested_t, m_CallbackGameServerChangeRequested); STEAM_CALLBACK(CSteam3Client, OnGameServerChangeRequested, GameServerChangeRequested_t, m_CallbackGameServerChangeRequested);
STEAM_CALLBACK(CSteam3Client, OnGameOverlayActivated, GameOverlayActivated_t, m_CallbackGameOverlayActivated); STEAM_CALLBACK(CSteam3Client, OnGameOverlayActivated, GameOverlayActivated_t, m_CallbackGameOverlayActivated);
/* <ed984> ../engine/sv_steam3.h:104 */ CSteam3Client() :
CSteam3Client(void) :
m_CallbackClientGameServerDeny(this, &CSteam3Client::OnClientGameServerDeny), m_CallbackClientGameServerDeny(this, &CSteam3Client::OnClientGameServerDeny),
m_CallbackGameServerChangeRequested(this, &CSteam3Client::OnGameServerChangeRequested), m_CallbackGameServerChangeRequested(this, &CSteam3Client::OnGameServerChangeRequested),
m_CallbackGameOverlayActivated(this, &CSteam3Client::OnGameOverlayActivated) m_CallbackGameOverlayActivated(this, &CSteam3Client::OnGameOverlayActivated)
{ } {}
/* <ed9d6> ../engine/sv_steam3.cpp:523 */ virtual void Shutdown();
virtual void Shutdown(void); /* linkage=_ZN13CSteam3Client8ShutdownEv */
/* <ed9fb> ../engine/sv_steam3.cpp:816 */ int InitiateGameConnection(void *pData, int cbMaxData, uint64 steamID, uint32 unIPServer, uint16 usPortServer, bool bSecure);
int InitiateGameConnection(void *pData, int cbMaxData, uint64 steamID, uint32 unIPServer, uint16 usPortServer, bool bSecure); /* linkage=_ZN13CSteam3Client22InitiateGameConnectionEPviyjtb */ void TerminateConnection(uint32, uint16);
void InitClient();
/* <eda3a> ../engine/sv_steam3.cpp:822 */ void RunFrame();
void TerminateConnection(uint32, uint16); /* linkage=_ZN13CSteam3Client19TerminateConnectionEjt */
/* <ed99c> ../engine/sv_steam3.cpp:827 */
void InitClient(void); /* linkage=_ZN13CSteam3Client10InitClientEv */
/* <ed9b9> ../engine/sv_steam3.cpp:905 */
void RunFrame(void); /* linkage=_ZN13CSteam3Client8RunFrameEv */
}; };
#ifdef HOOK_ENGINE #ifdef HOOK_ENGINE
#define s_Steam3Server (*ps_Steam3Server) #define s_Steam3Server (*ps_Steam3Server)
#define s_Steam3Client (*ps_Steam3Client) #define s_Steam3Client (*ps_Steam3Client)
#endif // HOOK_ENGINE #endif // HOOK_ENGINE
extern CSteam3Server *s_Steam3Server; extern CSteam3Server *s_Steam3Server;
extern CSteam3Client s_Steam3Client; extern CSteam3Client s_Steam3Client;
extern bool (CSteam3Server::*pNotifyClientConnect)(client_t *client, const void *pvSteam2Key, uint32 ucbSteam2Key); extern bool (CSteam3Server::*pNotifyClientConnect)(client_t *client, const void *pvSteam2Key, uint32 ucbSteam2Key);
uint64 ISteamGameServer_CreateUnauthenticatedUserConnection();
uint64 ISteamGameServer_CreateUnauthenticatedUserConnection(void);
bool ISteamGameServer_BUpdateUserData(uint64 steamid, const char *netname, uint32 score); bool ISteamGameServer_BUpdateUserData(uint64 steamid, const char *netname, uint32 score);
bool ISteamApps_BIsSubscribedApp(uint32 appid); bool ISteamApps_BIsSubscribedApp(uint32 appid);
const char *Steam_GetCommunityName(void); const char *Steam_GetCommunityName();
qboolean Steam_NotifyClientConnect(client_t *cl, const void *pvSteam2Key, unsigned int ucbSteam2Key); qboolean Steam_NotifyClientConnect(client_t *cl, const void *pvSteam2Key, unsigned int ucbSteam2Key);
qboolean Steam_NotifyClientConnect_internal(client_t *cl, const void *pvSteam2Key, unsigned int ucbSteam2Key); qboolean Steam_NotifyClientConnect_internal(client_t *cl, const void *pvSteam2Key, unsigned int ucbSteam2Key);
qboolean Steam_NotifyClientConnect_api(IGameClient *cl, const void *pvSteam2Key, unsigned int ucbSteam2Key); qboolean Steam_NotifyClientConnect_api(IGameClient *cl, const void *pvSteam2Key, unsigned int ucbSteam2Key);
@ -210,26 +146,26 @@ qboolean Steam_NotifyBotConnect_api(IGameClient* cl);
void Steam_NotifyClientDisconnect(client_t *cl); void Steam_NotifyClientDisconnect(client_t *cl);
void Steam_NotifyClientDisconnect_internal(IGameClient *cl); void Steam_NotifyClientDisconnect_internal(IGameClient *cl);
void Steam_NotifyClientDisconnect_api(IGameClient* cl); void Steam_NotifyClientDisconnect_api(IGameClient* cl);
void Steam_NotifyOfLevelChange(void); void Steam_NotifyOfLevelChange();
void Steam_Shutdown(void); void Steam_Shutdown();
void Steam_Activate(void); void Steam_Activate();
void Steam_RunFrame(void); void Steam_RunFrame();
void Steam_SetCVar(const char *pchKey, const char *pchValue); void Steam_SetCVar(const char *pchKey, const char *pchValue);
void Steam_ClientRunFrame(void); void Steam_ClientRunFrame();
void Steam_InitClient(void); void Steam_InitClient();
int Steam_GSInitiateGameConnection(void *pData, int cbMaxData, uint64 steamID, uint32 unIPServer, uint16 usPortServer, qboolean bSecure); int Steam_GSInitiateGameConnection(void *pData, int cbMaxData, uint64 steamID, uint32 unIPServer, uint16 usPortServer, qboolean bSecure);
void Steam_GSTerminateGameConnection(uint32 unIPServer, uint16 usPortServer); void Steam_GSTerminateGameConnection(uint32 unIPServer, uint16 usPortServer);
void Steam_ShutdownClient(void); void Steam_ShutdownClient();
uint64 Steam_GSGetSteamID(void); uint64 Steam_GSGetSteamID();
qboolean Steam_GSBSecure(void); qboolean Steam_GSBSecure();
qboolean Steam_GSBLoggedOn(void); qboolean Steam_GSBLoggedOn();
qboolean Steam_GSBSecurePreference(void); qboolean Steam_GSBSecurePreference();
TSteamGlobalUserID Steam_Steam3IDtoSteam2(uint64 unSteamID); TSteamGlobalUserID Steam_Steam3IDtoSteam2(uint64 unSteamID);
uint64 Steam_StringToSteamID(const char *pStr); uint64 Steam_StringToSteamID(const char *pStr);
const char *Steam_GetGSUniverse(void); const char *Steam_GetGSUniverse();
CSteam3Server *Steam3Server(void); CSteam3Server *Steam3Server();
CSteam3Client *Steam3Client(void); CSteam3Client *Steam3Client();
void Master_SetMaster_f(void); void Master_SetMaster_f();
void Steam_HandleIncomingPacket(byte *data, int len, int fromip, uint16 port); void Steam_HandleIncomingPacket(byte *data, int len, int fromip, uint16 port);
#endif // SV_STEAM3_H #endif // SV_STEAM3_H

28
rehlds/engine/sv_upld.cpp
View File

@ -28,13 +28,11 @@
#include "precompiled.h" #include "precompiled.h"
/* <b9b44> ../engine/sv_upld.c:51 */
// Checks MD5 of the resource against local cache and returns TRUE if resource was found or if downloads are disabled. Otherwise, if resource was requested from the player, it returns FALSE. // Checks MD5 of the resource against local cache and returns TRUE if resource was found or if downloads are disabled. Otherwise, if resource was requested from the player, it returns FALSE.
qboolean SV_CheckFile(sizebuf_t *msg, char *filename) qboolean SV_CheckFile(sizebuf_t *msg, char *filename)
{ {
resource_t p = { }; resource_t p = { };
#ifdef REHLDS_FIXES #ifdef REHLDS_FIXES
// FIXED: First, check for allowed downloads, then try to lookup, this is faster if downloads aren't enabled // FIXED: First, check for allowed downloads, then try to lookup, this is faster if downloads aren't enabled
@ -88,7 +86,6 @@ qboolean SV_CheckFile(sizebuf_t *msg, char *filename)
return FALSE; return FALSE;
} }
/* <b9bc1> ../engine/sv_upld.c:93 */
void SV_ClearResourceLists(client_t *cl) void SV_ClearResourceLists(client_t *cl)
{ {
if (!cl) if (!cl)
@ -100,7 +97,6 @@ void SV_ClearResourceLists(client_t *cl)
SV_ClearResourceList(&cl->resourcesonhand); SV_ClearResourceList(&cl->resourcesonhand);
} }
/* <b9c82> ../engine/sv_upld.c:108 */
// Reinitializes customizations list. Tries to create customization for each resource in on-hands list. // Reinitializes customizations list. Tries to create customization for each resource in on-hands list.
void SV_CreateCustomizationList(client_t *pHost) void SV_CreateCustomizationList(client_t *pHost)
{ {
@ -154,7 +150,6 @@ void SV_CreateCustomizationList(client_t *pHost)
} }
} }
/* <b9d0e> ../engine/sv_upld.c:185 */
// Sends resource to all other players, optionally skipping originating player. // Sends resource to all other players, optionally skipping originating player.
void SV_Customization(client_t *pPlayer, resource_t *pResource, qboolean bSkipPlayer) void SV_Customization(client_t *pPlayer, resource_t *pResource, qboolean bSkipPlayer)
{ {
@ -198,7 +193,6 @@ void SV_Customization(client_t *pPlayer, resource_t *pResource, qboolean bSkipPl
} }
} }
/* <b9d4e> ../engine/sv_upld.c:241 */
// Creates customizations list for the current player and sends resources to other players. // Creates customizations list for the current player and sends resources to other players.
void SV_RegisterResources(void) void SV_RegisterResources(void)
{ {
@ -221,7 +215,6 @@ void SV_RegisterResources(void)
#endif // REHLDS_FIXES #endif // REHLDS_FIXES
} }
/* <b9db7> ../engine/sv_upld.c:276 */
void SV_MoveToOnHandList(resource_t *pResource) void SV_MoveToOnHandList(resource_t *pResource)
{ {
if (!pResource) if (!pResource)
@ -234,7 +227,6 @@ void SV_MoveToOnHandList(resource_t *pResource)
SV_AddToResourceList(pResource, &host_client->resourcesonhand); SV_AddToResourceList(pResource, &host_client->resourcesonhand);
} }
/* <b9e30> ../engine/sv_upld.c:296 */
void SV_AddToResourceList(resource_t *pResource, resource_t *pList) void SV_AddToResourceList(resource_t *pResource, resource_t *pList)
{ {
if (pResource->pPrev || pResource->pNext) if (pResource->pPrev || pResource->pNext)
@ -249,7 +241,6 @@ void SV_AddToResourceList(resource_t *pResource, resource_t *pList)
pList->pPrev = pResource; pList->pPrev = pResource;
} }
/* <b9e76> ../engine/sv_upld.c:316 */
void SV_ClearResourceList(resource_t *pList) void SV_ClearResourceList(resource_t *pList)
{ {
resource_t *p, *n; resource_t *p, *n;
@ -267,7 +258,6 @@ void SV_ClearResourceList(resource_t *pList)
pList->pNext = pList; pList->pNext = pList;
} }
/* <b9ec0> ../engine/sv_upld.c:339 */
void SV_RemoveFromResourceList(resource_t *pResource) void SV_RemoveFromResourceList(resource_t *pResource)
{ {
pResource->pPrev->pNext = pResource->pNext; pResource->pPrev->pNext = pResource->pNext;
@ -276,7 +266,6 @@ void SV_RemoveFromResourceList(resource_t *pResource)
pResource->pNext = NULL; pResource->pNext = NULL;
} }
/* <b9edd> ../engine/sv_upld.c:355 */
// For each t_decal and RES_CUSTOM resource the player had shown to us, tries to find it locally or count size required to be downloaded. // For each t_decal and RES_CUSTOM resource the player had shown to us, tries to find it locally or count size required to be downloaded.
int SV_EstimateNeededResources(void) int SV_EstimateNeededResources(void)
{ {
@ -311,7 +300,6 @@ int SV_EstimateNeededResources(void)
return size; return size;
} }
/* <b9f72> ../engine/sv_upld.c:391 */
// This is called each frame to do checks on players if they uploaded all files that where requested from them. // This is called each frame to do checks on players if they uploaded all files that where requested from them.
void SV_RequestMissingResourcesFromClients(void) void SV_RequestMissingResourcesFromClients(void)
{ {
@ -327,7 +315,6 @@ void SV_RequestMissingResourcesFromClients(void)
} }
} }
/* <b9f53> ../engine/sv_upld.c:406 */
// Creates customizations list for a player (the current player actually, see the caller) and sends them out to other players when all needed resources are on-hands. Also sends other players customizations to the current player. // Creates customizations list for a player (the current player actually, see the caller) and sends them out to other players when all needed resources are on-hands. Also sends other players customizations to the current player.
qboolean SV_UploadComplete(client_t *cl) qboolean SV_UploadComplete(client_t *cl)
{ {
@ -346,7 +333,6 @@ qboolean SV_UploadComplete(client_t *cl)
return FALSE; return FALSE;
} }
/* <ba03e> ../engine/sv_upld.c:423 */
// For each resource the player had shown to us, moves it to on-hands list. For t_decal and RES_CUSTOM it tries to find it locally or request resource from the player. // For each resource the player had shown to us, moves it to on-hands list. For t_decal and RES_CUSTOM it tries to find it locally or request resource from the player.
void SV_BatchUploadRequest(client_t *cl) void SV_BatchUploadRequest(client_t *cl)
{ {
@ -380,7 +366,6 @@ void SV_BatchUploadRequest(client_t *cl)
} }
} }
/* <b9f44> ../engine/sv_upld.c:467 */
// This is used to do recurring checks on the current player that he uploaded all resources that where needed. // This is used to do recurring checks on the current player that he uploaded all resources that where needed.
qboolean SV_RequestMissingResources(void) qboolean SV_RequestMissingResources(void)
{ {
@ -391,7 +376,6 @@ qboolean SV_RequestMissingResources(void)
return FALSE; return FALSE;
} }
/* <ba1d0> ../engine/sv_upld.c:491 */
void SV_ParseResourceList(client_t *pSenderClient) void SV_ParseResourceList(client_t *pSenderClient)
{ {
int i, total; int i, total;
@ -402,10 +386,10 @@ void SV_ParseResourceList(client_t *pSenderClient)
total = MSG_ReadShort(); total = MSG_ReadShort();
#ifdef REHLDS_FIXES #ifdef REHLDS_FIXES
SV_ClearResourceLists( host_client ); SV_ClearResourceLists(host_client);
#else // REHLDS_FIXES #else // REHLDS_FIXES
SV_ClearResourceList( &host_client->resourcesneeded ); SV_ClearResourceList(&host_client->resourcesneeded);
SV_ClearResourceList( &host_client->resourcesonhand ); SV_ClearResourceList(&host_client->resourcesonhand);
#endif // REHLDS_FIXES #endif // REHLDS_FIXES
#ifdef REHLDS_FIXES #ifdef REHLDS_FIXES
@ -446,7 +430,7 @@ void SV_ParseResourceList(client_t *pSenderClient)
#else // REHLDS_FIXES #else // REHLDS_FIXES
SV_ClearResourceList( &host_client->resourcesneeded ); SV_ClearResourceList( &host_client->resourcesneeded );
SV_ClearResourceList( &host_client->resourcesonhand ); SV_ClearResourceList( &host_client->resourcesonhand );
#endif // REHLDS_FIXES #endif // REHLDS_FIXES
return; return;
} }
@ -477,7 +461,7 @@ void SV_ParseResourceList(client_t *pSenderClient)
total = ri.info[t_sound].size; total = ri.info[t_sound].size;
Con_DPrintf(" Sounds: %.2fK\n", total / 1024.0f); Con_DPrintf(" Sounds: %.2fK\n", total / 1024.0f);
} }
if (ri.info[t_decal].size) if (ri.info[t_decal].size)
{ {
#endif // REHLDS_FIXES #endif // REHLDS_FIXES
// this check is useless, because presence of decals was checked before. // this check is useless, because presence of decals was checked before.

75
rehlds/engine/sv_user.cpp
View File

@ -28,7 +28,6 @@
#include "precompiled.h" #include "precompiled.h"
/* <bf281> ../engine/sv_user.c:21 */
typedef struct command_s typedef struct command_s
{ {
char *command; char *command;
@ -40,7 +39,6 @@ qboolean g_balreadymoved;
float s_LastFullUpdate[33]; float s_LastFullUpdate[33];
//cvar_t sv_voicecodec; //cvar_t sv_voicecodec;
//cvar_t sv_voicequality; //cvar_t sv_voicequality;
edict_t *sv_player; edict_t *sv_player;
@ -89,7 +87,7 @@ clc_func_t sv_clcfuncs[] = {
{ clc_endoflist, "End of List", NULL }, { clc_endoflist, "End of List", NULL },
}; };
#else //HOOK_ENGINE #else // HOOK_ENGINE
command_t clcommands[23]; command_t clcommands[23];
@ -108,13 +106,12 @@ cvar_t sv_voiceenable;
clc_func_t sv_clcfuncs[12]; clc_func_t sv_clcfuncs[12];
#endif //HOOK_ENGINE #endif // HOOK_ENGINE
bool EXT_FUNC SV_CheckConsistencyResponse_API(IGameClient *client, resource_t *res, uint32 hash) { bool EXT_FUNC SV_CheckConsistencyResponse_API(IGameClient *client, resource_t *res, uint32 hash) {
return (hash != *(uint32 *)&res->rgucMD5_hash[0]); return (hash != *(uint32 *)&res->rgucMD5_hash[0]);
} }
/* <bf76a> ../engine/sv_user.c:94 */
void SV_ParseConsistencyResponse(client_t *pSenderClient) void SV_ParseConsistencyResponse(client_t *pSenderClient)
{ {
vec3_t mins; vec3_t mins;
@ -215,7 +212,7 @@ void SV_ParseConsistencyResponse(client_t *pSenderClient)
++length; ++length;
} }
MSG_EndBitReading(&net_message); MSG_EndBitReading(&net_message);
if (c < 0 || length != g_psv.num_consistency) if (c < 0 || length != g_psv.num_consistency)
{ {
@ -254,7 +251,6 @@ void SV_ParseConsistencyResponse(client_t *pSenderClient)
host_client->has_force_unmodified = 0; host_client->has_force_unmodified = 0;
} }
/* <bf937> ../engine/sv_user.c:267 */
qboolean EXT_FUNC SV_FileInConsistencyList(const char *filename, consistency_t **ppconsist) qboolean EXT_FUNC SV_FileInConsistencyList(const char *filename, consistency_t **ppconsist)
{ {
for (int i = 0; i < ARRAYSIZE(g_psv.consistency_list); i++) for (int i = 0; i < ARRAYSIZE(g_psv.consistency_list); i++)
@ -273,7 +269,6 @@ qboolean EXT_FUNC SV_FileInConsistencyList(const char *filename, consistency_t *
return 0; return 0;
} }
/* <bf9a8> ../engine/sv_user.c:298 */
int SV_TransferConsistencyInfo(void) int SV_TransferConsistencyInfo(void)
{ {
return g_RehldsHookchains.m_SV_TransferConsistencyInfo.callChain(SV_TransferConsistencyInfo_internal); return g_RehldsHookchains.m_SV_TransferConsistencyInfo.callChain(SV_TransferConsistencyInfo_internal);
@ -342,7 +337,6 @@ int EXT_FUNC SV_TransferConsistencyInfo_internal(void)
return c; return c;
} }
/* <bfa60> ../engine/sv_user.c:374 */
void SV_SendConsistencyList(sizebuf_t *msg) void SV_SendConsistencyList(sizebuf_t *msg)
{ {
host_client->has_force_unmodified = FALSE; host_client->has_force_unmodified = FALSE;
@ -391,12 +385,10 @@ void SV_SendConsistencyList(sizebuf_t *msg)
MSG_WriteBits(0, 1); MSG_WriteBits(0, 1);
} }
/* <bfaca> ../engine/sv_user.c:439 */
void SV_PreRunCmd(void) void SV_PreRunCmd(void)
{ {
} }
/* <bfb02> ../engine/sv_user.c:450 */
void SV_CopyEdictToPhysent(physent_t *pe, int e, edict_t *check) void SV_CopyEdictToPhysent(physent_t *pe, int e, edict_t *check)
{ {
model_t *pModel; model_t *pModel;
@ -414,7 +406,7 @@ void SV_CopyEdictToPhysent(physent_t *pe, int e, edict_t *check)
SV_GetTrueOrigin(e - 1, pe->origin); SV_GetTrueOrigin(e - 1, pe->origin);
pe->player = pe->info; pe->player = pe->info;
} }
pe->angles[0] = check->v.angles[0]; pe->angles[0] = check->v.angles[0];
pe->angles[1] = check->v.angles[1]; pe->angles[1] = check->v.angles[1];
pe->angles[2] = check->v.angles[2]; pe->angles[2] = check->v.angles[2];
@ -513,7 +505,6 @@ void SV_CopyEdictToPhysent(physent_t *pe, int e, edict_t *check)
pe->vuser4[2] = check->v.vuser4[2]; pe->vuser4[2] = check->v.vuser4[2];
} }
/* <bfbc4> ../engine/sv_user.c:579 */
void SV_AddLinksToPM_(areanode_t *node, float *pmove_mins, float *pmove_maxs) void SV_AddLinksToPM_(areanode_t *node, float *pmove_mins, float *pmove_maxs)
{ {
struct link_s *l; struct link_s *l;
@ -602,7 +593,7 @@ void SV_AddLinksToPM_(areanode_t *node, float *pmove_mins, float *pmove_maxs)
} }
pe = &pmove->moveents[pmove->nummoveent++]; pe = &pmove->moveents[pmove->nummoveent++];
} }
Q_memcpy(pe, ve, sizeof(physent_t)); Q_memcpy(pe, ve, sizeof(physent_t));
} }
@ -616,7 +607,6 @@ void SV_AddLinksToPM_(areanode_t *node, float *pmove_mins, float *pmove_maxs)
} }
} }
/* <bfcc2> ../engine/sv_user.c:712 */
void SV_AddLinksToPM(areanode_t *node, vec_t *origin) void SV_AddLinksToPM(areanode_t *node, vec_t *origin)
{ {
vec3_t pmove_mins; vec3_t pmove_mins;
@ -624,7 +614,7 @@ void SV_AddLinksToPM(areanode_t *node, vec_t *origin)
Q_memset(&pmove->physents[0], 0, sizeof(physent_t)); Q_memset(&pmove->physents[0], 0, sizeof(physent_t));
Q_memset(&pmove->visents[0], 0, sizeof(physent_t)); Q_memset(&pmove->visents[0], 0, sizeof(physent_t));
pmove->physents[0].model = g_psv.worldmodel; pmove->physents[0].model = g_psv.worldmodel;
if (g_psv.worldmodel != NULL) if (g_psv.worldmodel != NULL)
{ {
@ -651,14 +641,12 @@ void SV_AddLinksToPM(areanode_t *node, vec_t *origin)
SV_AddLinksToPM_(node, pmove_mins, pmove_maxs); SV_AddLinksToPM_(node, pmove_mins, pmove_maxs);
} }
/* <bfd01> ../engine/sv_user.c:758 */
void SV_PlayerRunPreThink(edict_t *player, float time) void SV_PlayerRunPreThink(edict_t *player, float time)
{ {
gGlobalVariables.time = time; gGlobalVariables.time = time;
gEntityInterface.pfnPlayerPreThink(player); gEntityInterface.pfnPlayerPreThink(player);
} }
/* <bfd26> ../engine/sv_user.c:774 */
qboolean SV_PlayerRunThink(edict_t *ent, float frametime, double clienttimebase) qboolean SV_PlayerRunThink(edict_t *ent, float frametime, double clienttimebase)
{ {
float thinktime; float thinktime;
@ -683,7 +671,6 @@ qboolean SV_PlayerRunThink(edict_t *ent, float frametime, double clienttimebase)
return ent->free == 0; return ent->free == 0;
} }
/* <bfda1> ../engine/sv_user.c:814 */
void SV_CheckMovingGround(edict_t *player, float frametime) void SV_CheckMovingGround(edict_t *player, float frametime)
{ {
edict_t *groundentity; edict_t *groundentity;
@ -715,7 +702,6 @@ void SV_CheckMovingGround(edict_t *player, float frametime)
player->v.flags &= ~FL_BASEVELOCITY; player->v.flags &= ~FL_BASEVELOCITY;
} }
/* <bfdea> ../engine/sv_user.c:852 */
void SV_ConvertPMTrace(trace_t *dest, pmtrace_t *src, edict_t *ent) void SV_ConvertPMTrace(trace_t *dest, pmtrace_t *src, edict_t *ent)
{ {
dest->allsolid = src->allsolid; dest->allsolid = src->allsolid;
@ -734,7 +720,6 @@ void SV_ConvertPMTrace(trace_t *dest, pmtrace_t *src, edict_t *ent)
dest->ent = ent; dest->ent = ent;
} }
/* <bfe17> ../engine/sv_user.c:873 */
void SV_ForceFullClientsUpdate(void) void SV_ForceFullClientsUpdate(void)
{ {
byte data[9216]; byte data[9216];
@ -758,7 +743,6 @@ void SV_ForceFullClientsUpdate(void)
Netchan_FragSend(&host_client->netchan); Netchan_FragSend(&host_client->netchan);
} }
/* <c023b> ../engine/sv_user.c:918 */
void SV_RunCmd(usercmd_t *ucmd, int random_seed) void SV_RunCmd(usercmd_t *ucmd, int random_seed)
{ {
usercmd_t cmd = *ucmd; usercmd_t cmd = *ucmd;
@ -1004,11 +988,8 @@ void SV_RunCmd(usercmd_t *ucmd, int random_seed)
if (!host_client->fakeclient) if (!host_client->fakeclient)
SV_RestoreMove(host_client); SV_RestoreMove(host_client);
} }
/* <bf889> ../engine/sv_user.c:1197 */
int SV_ValidateClientCommand(char *pszCommand) int SV_ValidateClientCommand(char *pszCommand)
{ {
char *p; char *p;
@ -1026,7 +1007,6 @@ int SV_ValidateClientCommand(char *pszCommand)
return 0; return 0;
} }
/* <bfeb0> ../engine/sv_user.c:1226 */
float SV_CalcClientTime(client_t *cl) float SV_CalcClientTime(client_t *cl)
{ {
float minping; float minping;
@ -1062,7 +1042,7 @@ float SV_CalcClientTime(client_t *cl)
minping = 9999.0; minping = 9999.0;
maxping = -9999.0; maxping = -9999.0;
ping /= count; ping /= count;
for (int i = 0; i < (SV_UPDATE_BACKUP <= 4 ? SV_UPDATE_BACKUP : 4); i++) for (int i = 0; i < (SV_UPDATE_BACKUP <= 4 ? SV_UPDATE_BACKUP : 4); i++)
{ {
client_frame_t *frame = &cl->frames[SV_UPDATE_MASK & (cl->netchan.incoming_acknowledged - i)]; client_frame_t *frame = &cl->frames[SV_UPDATE_MASK & (cl->netchan.incoming_acknowledged - i)];
@ -1082,13 +1062,11 @@ float SV_CalcClientTime(client_t *cl)
return 0.0f; return 0.0f;
} }
/* <bff47> ../engine/sv_user.c:1297 */
void SV_ComputeLatency(client_t *cl) void SV_ComputeLatency(client_t *cl)
{ {
cl->latency = SV_CalcClientTime(cl); cl->latency = SV_CalcClientTime(cl);
} }
/* <bf3ae> ../engine/sv_user.c:1339 */
int SV_UnlagCheckTeleport(vec_t *v1, vec_t *v2) int SV_UnlagCheckTeleport(vec_t *v1, vec_t *v2)
{ {
for (int i = 0; i < 3; i++) for (int i = 0; i < 3; i++)
@ -1100,7 +1078,6 @@ int SV_UnlagCheckTeleport(vec_t *v1, vec_t *v2)
return 0; return 0;
} }
/* <bfada> ../engine/sv_user.c:1361 */
void SV_GetTrueOrigin(int player, vec_t *origin) void SV_GetTrueOrigin(int player, vec_t *origin)
{ {
if (!host_client->lw || !host_client->lc) if (!host_client->lw || !host_client->lc)
@ -1112,7 +1089,6 @@ void SV_GetTrueOrigin(int player, vec_t *origin)
if (player < 0 || player >= g_psvs.maxclients) if (player < 0 || player >= g_psvs.maxclients)
return; return;
if (truepositions[player].active && truepositions[player].needrelink) if (truepositions[player].active && truepositions[player].needrelink)
{ {
origin[0] = truepositions[player].oldorg[0]; origin[0] = truepositions[player].oldorg[0];
@ -1121,7 +1097,6 @@ void SV_GetTrueOrigin(int player, vec_t *origin)
} }
} }
/* <bfb8a> ../engine/sv_user.c:1383 */
void SV_GetTrueMinMax(int player, float **fmin, float **fmax) void SV_GetTrueMinMax(int player, float **fmin, float **fmax)
{ {
if (!host_client->lw || !host_client->lc) if (!host_client->lw || !host_client->lc)
@ -1138,10 +1113,8 @@ void SV_GetTrueMinMax(int player, float **fmin, float **fmax)
*fmin = truepositions[player].oldabsmin; *fmin = truepositions[player].oldabsmin;
*fmax = truepositions[player].oldabsmax; *fmax = truepositions[player].oldabsmax;
} }
} }
/* <bf3e2> ../engine/sv_user.c:1406 */
entity_state_t *SV_FindEntInPack(int index, packet_entities_t *pack) entity_state_t *SV_FindEntInPack(int index, packet_entities_t *pack)
{ {
if (pack->num_entities <= 0) if (pack->num_entities <= 0)
@ -1156,7 +1129,6 @@ entity_state_t *SV_FindEntInPack(int index, packet_entities_t *pack)
return NULL; return NULL;
} }
/* <c0030> ../engine/sv_user.c:1426 */
void SV_SetupMove(client_t *_host_client) void SV_SetupMove(client_t *_host_client)
{ {
struct client_s *cl; struct client_s *cl;
@ -1171,9 +1143,9 @@ void SV_SetupMove(client_t *_host_client)
vec3_t origin; vec3_t origin;
vec3_t delta; vec3_t delta;
#ifdef REHLDS_FIXES #ifdef REHLDS_FIXES
double targettime; //FP precision fix double targettime; // FP precision fix
#else #else
float targettime; float targettime;
#endif // REHLDS_FIXES #endif // REHLDS_FIXES
@ -1222,7 +1194,7 @@ void SV_SetupMove(client_t *_host_client)
} }
cl_interptime = _host_client->lastcmd.lerp_msec / 1000.0f; cl_interptime = _host_client->lastcmd.lerp_msec / 1000.0f;
if (cl_interptime > 0.1) if (cl_interptime > 0.1)
cl_interptime = 0.1f; cl_interptime = 0.1f;
@ -1378,7 +1350,6 @@ void SV_SetupMove(client_t *_host_client)
} }
} }
/* <c01e6> ../engine/sv_user.c:1670 */
void SV_RestoreMove(client_t *_host_client) void SV_RestoreMove(client_t *_host_client)
{ {
sv_adjusted_positions_t *pos; sv_adjusted_positions_t *pos;
@ -1426,7 +1397,6 @@ void SV_RestoreMove(client_t *_host_client)
} }
} }
/* <bf8bd> ../engine/sv_user.c:1736 */
void SV_ParseStringCommand(client_t *pSenderClient) void SV_ParseStringCommand(client_t *pSenderClient)
{ {
//check string commands rate for this player //check string commands rate for this player
@ -1461,7 +1431,6 @@ void SV_ParseStringCommand(client_t *pSenderClient)
} }
} }
/* <bf600> ../engine/sv_user.c:1777 */
void SV_ParseDelta(client_t *pSenderClient) void SV_ParseDelta(client_t *pSenderClient)
{ {
host_client->delta_sequence = MSG_ReadByte(); host_client->delta_sequence = MSG_ReadByte();
@ -1477,7 +1446,6 @@ void SV_EstablishTimeBase(client_t *cl, usercmd_t *cmds, int dropped, int numbac
return g_RehldsHookchains.m_SV_EstablishTimeBase.callChain(SV_EstablishTimeBase_mod, GetRehldsApiClient(cl), cmds, dropped, numbackup, numcmds); return g_RehldsHookchains.m_SV_EstablishTimeBase.callChain(SV_EstablishTimeBase_mod, GetRehldsApiClient(cl), cmds, dropped, numbackup, numcmds);
} }
/* <c03df> ../engine/sv_user.c:1790 */
void SV_EstablishTimeBase_internal(client_t *cl, usercmd_t *cmds, int dropped, int numbackup, int numcmds) void SV_EstablishTimeBase_internal(client_t *cl, usercmd_t *cmds, int dropped, int numbackup, int numcmds)
{ {
int cmdnum; int cmdnum;
@ -1492,7 +1460,7 @@ void SV_EstablishTimeBase_internal(client_t *cl, usercmd_t *cmds, int dropped, i
cmdnum = dropped - (dropped - numbackup); cmdnum = dropped - (dropped - numbackup);
runcmd_time = (double)cl->lastcmd.msec * (dropped - numbackup) / 1000.0; runcmd_time = (double)cl->lastcmd.msec * (dropped - numbackup) / 1000.0;
} }
for (; cmdnum > 0; cmdnum--) for (; cmdnum > 0; cmdnum--)
{ {
runcmd_time += cmds[cmdnum - 1 + numcmds].msec / 1000.0; runcmd_time += cmds[cmdnum - 1 + numcmds].msec / 1000.0;
@ -1507,7 +1475,6 @@ void SV_EstablishTimeBase_internal(client_t *cl, usercmd_t *cmds, int dropped, i
cl->svtimebase = host_frametime + g_psv.time - runcmd_time; cl->svtimebase = host_frametime + g_psv.time - runcmd_time;
} }
/* <bf48b> ../engine/sv_user.c:1835 */
void SV_ParseMove(client_t *pSenderClient) void SV_ParseMove(client_t *pSenderClient)
{ {
client_frame_t *frame; client_frame_t *frame;
@ -1533,7 +1500,7 @@ void SV_ParseMove(client_t *pSenderClient)
frame = &host_client->frames[SV_UPDATE_MASK & host_client->netchan.incoming_acknowledged]; frame = &host_client->frames[SV_UPDATE_MASK & host_client->netchan.incoming_acknowledged];
Q_memset(&cmdNull, 0, sizeof(cmdNull)); Q_memset(&cmdNull, 0, sizeof(cmdNull));
placeholder = msg_readcount + 1; placeholder = msg_readcount + 1;
mlen = MSG_ReadByte(); mlen = MSG_ReadByte();
cbchecksum = MSG_ReadByte(); cbchecksum = MSG_ReadByte();
@ -1554,7 +1521,7 @@ void SV_ParseMove(client_t *pSenderClient)
msg_badread = 1; msg_badread = 1;
return; return;
} }
usercmd_t* from = &cmdNull; usercmd_t* from = &cmdNull;
for (int i = totalcmds - 1; i >= 0; i--) for (int i = totalcmds - 1; i >= 0; i--)
{ {
@ -1616,7 +1583,7 @@ void SV_ParseMove(client_t *pSenderClient)
numCmdsToIssue += net_drop; numCmdsToIssue += net_drop;
} }
g_MoveCommandRateLimiter.MoveCommandsIssued(host_client - g_psvs.clients, numCmdsToIssue); g_MoveCommandRateLimiter.MoveCommandsIssued(host_client - g_psvs.clients, numCmdsToIssue);
if (!host_client->connected) { if (!host_client->connected) {
return; //return if player was kicked return; //return if player was kicked
} }
@ -1641,7 +1608,7 @@ void SV_ParseMove(client_t *pSenderClient)
SV_RunCmd(&cmds[numcmds + net_drop - 1], host_client->netchan.incoming_sequence - (numcmds + net_drop - 1)); SV_RunCmd(&cmds[numcmds + net_drop - 1], host_client->netchan.incoming_sequence - (numcmds + net_drop - 1));
net_drop--; net_drop--;
} }
} }
for (int i = numcmds - 1; i >= 0; i--) for (int i = numcmds - 1; i >= 0; i--)
@ -1666,7 +1633,6 @@ void SV_ParseMove(client_t *pSenderClient)
sv_player->v.animtime = float(host_frametime + g_psv.time); sv_player->v.animtime = float(host_frametime + g_psv.time);
} }
/* <bf6bc> ../engine/sv_user.c:2022 */
void SV_ParseVoiceData(client_t *cl) void SV_ParseVoiceData(client_t *cl)
{ {
char chReceived[4096]; char chReceived[4096];
@ -1678,7 +1644,7 @@ void SV_ParseVoiceData(client_t *cl)
SV_DropClient(cl, FALSE, "Invalid voice data\n"); SV_DropClient(cl, FALSE, "Invalid voice data\n");
return; return;
} }
MSG_ReadBuf(nDataLength, chReceived); MSG_ReadBuf(nDataLength, chReceived);
cl->m_lastvoicetime = g_psv.time; cl->m_lastvoicetime = g_psv.time;
@ -1708,12 +1674,10 @@ void SV_ParseVoiceData(client_t *cl)
} }
} }
/* <bf5d8> ../engine/sv_user.c:2091 */
void SV_IgnoreHLTV(client_t *cl) void SV_IgnoreHLTV(client_t *cl)
{ {
} }
/* <bf62a> ../engine/sv_user.c:2096 */
void SV_ParseCvarValue(client_t *cl) void SV_ParseCvarValue(client_t *cl)
{ {
char *value; char *value;
@ -1724,7 +1688,6 @@ void SV_ParseCvarValue(client_t *cl)
Con_DPrintf("Cvar query response: name:%s, value:%s\n", cl->name, value); Con_DPrintf("Cvar query response: name:%s, value:%s\n", cl->name, value);
} }
/* <bf663> ../engine/sv_user.c:2107 */
void SV_ParseCvarValue2(client_t *cl) void SV_ParseCvarValue2(client_t *cl)
{ {
int requestID = MSG_ReadLong(); int requestID = MSG_ReadLong();
@ -1755,7 +1718,6 @@ void EXT_FUNC SV_HandleClientMessage_api(IGameClient* client, int8 opcode) {
func(cl); func(cl);
} }
/* <c05ad> ../engine/sv_user.c:2155 */
void SV_ExecuteClientMessage(client_t *cl) void SV_ExecuteClientMessage(client_t *cl)
{ {
g_balreadymoved = 0; g_balreadymoved = 0;
@ -1793,10 +1755,8 @@ void SV_ExecuteClientMessage(client_t *cl)
g_RehldsHookchains.m_HandleNetCommand.callChain(SV_HandleClientMessage_api, apiClient, c); g_RehldsHookchains.m_HandleNetCommand.callChain(SV_HandleClientMessage_api, apiClient, c);
} }
} }
/* <c062c> ../engine/sv_user.c:2233 */
qboolean SV_SetPlayer(int idnum) qboolean SV_SetPlayer(int idnum)
{ {
for (int i = 0; i < g_psvs.maxclients; i++) for (int i = 0; i < g_psvs.maxclients; i++)
@ -1817,7 +1777,6 @@ qboolean SV_SetPlayer(int idnum)
return 0; return 0;
} }
/* <c0677> ../engine/sv_user.c:2260 */
void SV_ShowServerinfo_f(void) void SV_ShowServerinfo_f(void)
{ {
if (cmd_source == src_command) if (cmd_source == src_command)
@ -1835,7 +1794,6 @@ void SV_ShowServerinfo_f(void)
} }
} }
/* <c068d> ../engine/sv_user.c:2277 */
void SV_SendEnts_f(void) void SV_SendEnts_f(void)
{ {
if (cmd_source == src_command) if (cmd_source == src_command)
@ -1877,7 +1835,6 @@ void SV_SendEnts_f(void)
} }
} }
/* <c06a2> ../engine/sv_user.c:2302 */
void SV_FullUpdate_f(void) void SV_FullUpdate_f(void)
{ {
int entIndex; int entIndex;

4
rehlds/engine/sv_user.h
View File

@ -41,7 +41,6 @@
typedef struct command_s command_t; typedef struct command_s command_t;
/* <bf2a3> ../engine/sv_user.c:1311 */
typedef struct sv_adjusted_positions_s typedef struct sv_adjusted_positions_s
{ {
int active; int active;
@ -56,7 +55,6 @@ typedef struct sv_adjusted_positions_s
int temp_org_setflag; int temp_org_setflag;
} sv_adjusted_positions_t; } sv_adjusted_positions_t;
/* <bf34f> ../engine/sv_user.c:2124 */
typedef struct clc_func_s typedef struct clc_func_s
{ {
unsigned char opcode; unsigned char opcode;
@ -99,7 +97,6 @@ extern clc_func_t sv_clcfuncs[12];
#else #else
#endif #endif
extern float s_LastFullUpdate[33]; extern float s_LastFullUpdate[33];
extern cvar_t sv_edgefriction; extern cvar_t sv_edgefriction;
extern cvar_t sv_maxspeed; extern cvar_t sv_maxspeed;
@ -116,7 +113,6 @@ extern cvar_t sv_voiceenable;
extern qboolean nofind; extern qboolean nofind;
void SV_ParseConsistencyResponse(client_t *pSenderClient); void SV_ParseConsistencyResponse(client_t *pSenderClient);
qboolean SV_FileInConsistencyList(const char *filename, consistency_t **ppconsist); qboolean SV_FileInConsistencyList(const char *filename, consistency_t **ppconsist);
int SV_TransferConsistencyInfo(void); int SV_TransferConsistencyInfo(void);

56
rehlds/engine/sys_dll.cpp
View File

@ -196,7 +196,7 @@ enginefuncs_t g_engfuncsExportedToDlls = {
EngCheckParm EngCheckParm
}; };
#else //HOOK_ENGINE #else // HOOK_ENGINE
int g_FPUCW_Mask_Prec_64Bit; int g_FPUCW_Mask_Prec_64Bit;
int g_FPUCW_Mask_Prec_64Bit_2; int g_FPUCW_Mask_Prec_64Bit_2;
@ -207,7 +207,7 @@ FileFindHandle_t g_hfind;
enginefuncs_t g_engfuncsExportedToDlls; enginefuncs_t g_engfuncsExportedToDlls;
#endif //HOOK_ENGINE #endif // HOOK_ENGINE
#ifdef _WIN32 #ifdef _WIN32
void Sys_SetupFPUOptions() void Sys_SetupFPUOptions()
@ -290,13 +290,11 @@ NOINLINE void Sys_FPUCW_Pop_Prec64() {
#endif // _WIN32 #endif // _WIN32
/* <8d234> ../engine/sys_dll.c:161 */
NOXREF void Sys_PageIn(void *ptr, int size) NOXREF void Sys_PageIn(void *ptr, int size)
{ {
} }
// TODO: investigate filesystem_stdio problem (multiple enumeration of files). // TODO: investigate filesystem_stdio problem (multiple enumeration of files).
/* <8d0fa> ../engine/sys_dll.c:201 */
const char *Sys_FindFirst(const char *path, char *basename) const char *Sys_FindFirst(const char *path, char *basename)
{ {
if (g_hfind != -1) if (g_hfind != -1)
@ -322,7 +320,6 @@ const char *Sys_FindFirst(const char *path, char *basename)
return psz; return psz;
} }
/* <8d565> ../engine/sys_dll.c:227 */
const char *Sys_FindFirstPathID(const char *path, char *pathid) const char *Sys_FindFirstPathID(const char *path, char *pathid)
{ {
//const char *psz;//unused? //const char *psz;//unused?
@ -332,7 +329,6 @@ const char *Sys_FindFirstPathID(const char *path, char *pathid)
} }
// TODO: investigate filesystem_stdio problem (multiple enumeration of files). // TODO: investigate filesystem_stdio problem (multiple enumeration of files).
/* <8d168> ../engine/sys_dll.c:247 */
const char *Sys_FindNext(char *basename) const char *Sys_FindNext(char *basename)
{ {
const char *psz = FS_FindNext(g_hfind); const char *psz = FS_FindNext(g_hfind);
@ -353,7 +349,6 @@ const char *Sys_FindNext(char *basename)
return psz; return psz;
} }
/* <8d290> ../engine/sys_dll.c:263 */
void Sys_FindClose(void) void Sys_FindClose(void)
{ {
if (g_hfind != -1) if (g_hfind != -1)
@ -367,7 +362,6 @@ void Sys_FindClose(void)
#endif // REHLDS_FIXES #endif // REHLDS_FIXES
} }
/* <8d2ac> ../engine/sys_dll.c:280 */
NOBODY int glob_match_after_star(char *pattern, char *text); NOBODY int glob_match_after_star(char *pattern, char *text);
//{ //{
// char *p; // 282 // char *p; // 282
@ -376,13 +370,12 @@ NOBODY int glob_match_after_star(char *pattern, char *text);
// char c1; // 283 // char c1; // 283
//} //}
/* <8d300> ../engine/sys_dll.c:323 */
NOBODY int glob_match(char *pattern, char *text); NOBODY int glob_match(char *pattern, char *text);
//{ //{
// char *p; // 325 // char *p; // 325
// char *t; // 325 // char *t; // 325
// char c; // 326 // char c; // 326
// //
//match : // 386; //match : // 386;
// { // {
// char c1; // 347 // char c1; // 347
@ -396,7 +389,6 @@ NOBODY int glob_match(char *pattern, char *text);
// char *text); /* size=0, low_pc=0 */ // 343 // char *text); /* size=0, low_pc=0 */ // 343
//} //}
/* <8d403> ../engine/sys_dll.c:424 */
NOXREF void Sys_MakeCodeWriteable(uint32 startaddr, uint32 length) NOXREF void Sys_MakeCodeWriteable(uint32 startaddr, uint32 length)
{ {
#ifdef _WIN32 #ifdef _WIN32
@ -405,30 +397,24 @@ NOXREF void Sys_MakeCodeWriteable(uint32 startaddr, uint32 length)
#endif // _WIN32 #endif // _WIN32
} }
/* <8d43b> ../engine/sys_dll.c:441 */
NOBODY void Sys_SetFPCW(void); NOBODY void Sys_SetFPCW(void);
//{ //{
//} //}
/* <8d450> ../engine/sys_dll.c:445 */
NOBODY void Sys_PushFPCW_SetHigh(void); NOBODY void Sys_PushFPCW_SetHigh(void);
//{ //{
//} //}
/* <8d465> ../engine/sys_dll.c:449 */
NOBODY void Sys_PopFPCW(void); NOBODY void Sys_PopFPCW(void);
//{ //{
//} //}
/* <8d47a> ../engine/sys_dll.c:453 */
NOBODY void MaskExceptions(void); NOBODY void MaskExceptions(void);
//{ //{
//} //}
/* <8d48f> ../engine/sys_dll.c:469 */
NOBODY void Sys_Init(void); NOBODY void Sys_Init(void);
/* <8d4a4> ../engine/sys_dll.c:509 */
NOXREF void Sys_Sleep(int msec) NOXREF void Sys_Sleep(int msec)
{ {
#ifdef _WIN32 #ifdef _WIN32
@ -438,12 +424,10 @@ NOXREF void Sys_Sleep(int msec)
#endif // _WIN32 #endif // _WIN32
} }
/* <8d4cd> ../engine/sys_dll.c:519 */
NOBODY void Sys_DebugOutStraight(const char *pStr); NOBODY void Sys_DebugOutStraight(const char *pStr);
//{ //{
//} //}
/* <8d4f7> ../engine/sys_dll.c:529 */
void __declspec(noreturn) Sys_Error(const char *error, ...) void __declspec(noreturn) Sys_Error(const char *error, ...)
{ {
va_list argptr; va_list argptr;
@ -515,7 +499,6 @@ void __declspec(noreturn) Sys_Error(const char *error, ...)
*(int *)NULL = NULL; *(int *)NULL = NULL;
} }
/* <8d626> ../engine/sys_dll.c:600 */
NOXREF void Sys_Warning(const char *pszWarning, ...) NOXREF void Sys_Warning(const char *pszWarning, ...)
{ {
va_list argptr; va_list argptr;
@ -528,7 +511,6 @@ NOXREF void Sys_Warning(const char *pszWarning, ...)
Sys_Printf(text); Sys_Printf(text);
} }
/* <8d5db> ../engine/sys_dll.c:612 */
void Sys_Printf(const char *fmt, ...) void Sys_Printf(const char *fmt, ...)
{ {
char Dest[1024]; char Dest[1024];
@ -550,7 +532,6 @@ void Sys_Printf(const char *fmt, ...)
} }
/* <8d671> ../engine/sys_dll.c:645 */
void Sys_Quit(void) void Sys_Quit(void)
{ {
giActive = DLL_CLOSE; giActive = DLL_CLOSE;
@ -636,13 +617,11 @@ double Sys_FloatTime(void)
#endif //_WIN32 #endif //_WIN32
/* <8d042> ../engine/sys_dll.c:830 */
void Dispatch_Substate(int iSubState) void Dispatch_Substate(int iSubState)
{ {
giSubState = iSubState; giSubState = iSubState;
} }
/* <8d6f5> ../engine/sys_dll.c:835 */
void GameSetSubState(int iSubState) void GameSetSubState(int iSubState)
{ {
if (iSubState & 2) if (iSubState & 2)
@ -655,18 +634,15 @@ void GameSetSubState(int iSubState)
} }
} }
/* <8d753> ../engine/sys_dll.c:847 */
void GameSetState(int iState) void GameSetState(int iState)
{ {
giActive = iState; giActive = iState;
} }
/* <8d77c> ../engine/sys_dll.c:853 */
NOBODY void GameSetBackground(qboolean bNewSetting); NOBODY void GameSetBackground(qboolean bNewSetting);
//{ //{
//} //}
/* <8d191> ../engine/sys_dll.c:1076 */
qboolean EXT_FUNC Voice_GetClientListening(int iReceiver, int iSender) qboolean EXT_FUNC Voice_GetClientListening(int iReceiver, int iSender)
{ {
--iReceiver; --iReceiver;
@ -682,7 +658,6 @@ qboolean EXT_FUNC Voice_GetClientListening(int iReceiver, int iSender)
#endif // REHLDS_FIXES #endif // REHLDS_FIXES
} }
/* <8d1d0> ../engine/sys_dll.c:1090 */
qboolean EXT_FUNC Voice_SetClientListening(int iReceiver, int iSender, qboolean bListen) qboolean EXT_FUNC Voice_SetClientListening(int iReceiver, int iSender, qboolean bListen)
{ {
--iReceiver; --iReceiver;
@ -704,7 +679,6 @@ qboolean EXT_FUNC Voice_SetClientListening(int iReceiver, int iSender, qboolean
return 1; return 1;
} }
/* <8d7a5> ../engine/sys_dll.c:1332 */
DISPATCHFUNCTION GetDispatch(char *pname) DISPATCHFUNCTION GetDispatch(char *pname)
{ {
int i; int i;
@ -722,7 +696,6 @@ DISPATCHFUNCTION GetDispatch(char *pname)
return NULL; return NULL;
} }
/* <8d80b> ../engine/sys_dll.c:1362 */
const char *FindAddressInTable(extensiondll_t *pDll, uint32 function) const char *FindAddressInTable(extensiondll_t *pDll, uint32 function)
{ {
#ifdef _WIN32 #ifdef _WIN32
@ -744,7 +717,6 @@ const char *FindAddressInTable(extensiondll_t *pDll, uint32 function)
return NULL; return NULL;
} }
/* <8d05e> ../engine/sys_dll.c:1383 */
uint32 FindNameInTable(extensiondll_t *pDll, const char *pName) uint32 FindNameInTable(extensiondll_t *pDll, const char *pName)
{ {
#ifdef _WIN32 #ifdef _WIN32
@ -761,7 +733,6 @@ uint32 FindNameInTable(extensiondll_t *pDll, const char *pName)
#endif // _WIN32 #endif // _WIN32
} }
/* <8d8a0> ../engine/sys_dll.c:1407 */
NOBODY const char *ConvertNameToLocalPlatform(const char *pchInName); NOBODY const char *ConvertNameToLocalPlatform(const char *pchInName);
//{ //{
// char s_szNewName; // 1409 // char s_szNewName; // 1409
@ -779,13 +750,11 @@ NOBODY const char *ConvertNameToLocalPlatform(const char *pchInName);
// } // }
//} //}
/* <8df19> ../engine/sys_dll.c:1499 */
uint32 EXT_FUNC FunctionFromName(const char *pName) uint32 EXT_FUNC FunctionFromName(const char *pName)
{ {
return 0; //TODO: do we really need to reverse it? return 0; //TODO: do we really need to reverse it?
} }
/* <8de9a> ../engine/sys_dll.c:1518 */
const char* EXT_FUNC NameForFunction(uint32 function) const char* EXT_FUNC NameForFunction(uint32 function)
{ {
int i; int i;
@ -804,19 +773,16 @@ const char* EXT_FUNC NameForFunction(uint32 function)
return NULL; return NULL;
} }
/* <8d9e7> ../engine/sys_dll.c:1536 */
ENTITYINIT GetEntityInit(char *pClassName) ENTITYINIT GetEntityInit(char *pClassName)
{ {
return (ENTITYINIT)GetDispatch(pClassName); return (ENTITYINIT)GetDispatch(pClassName);
} }
/* <8da46> ../engine/sys_dll.c:1543 */
FIELDIOFUNCTION GetIOFunction(char *pName) FIELDIOFUNCTION GetIOFunction(char *pName)
{ {
return (FIELDIOFUNCTION)GetDispatch(pName); return (FIELDIOFUNCTION)GetDispatch(pName);
} }
/* <8daa5> ../engine/sys_dll.c:1550 */
void DLL_SetModKey(modinfo_t *pinfo, char *pkey, char *pvalue) void DLL_SetModKey(modinfo_t *pinfo, char *pkey, char *pvalue)
{ {
if (!Q_stricmp(pkey, "url_info")) if (!Q_stricmp(pkey, "url_info"))
@ -888,7 +854,6 @@ void DLL_SetModKey(modinfo_t *pinfo, char *pkey, char *pvalue)
} }
/* <8e07f> ../engine/sys_dll.c:1629 */
void LoadEntityDLLs(const char *szBaseDir) void LoadEntityDLLs(const char *szBaseDir)
{ {
FileHandle_t hLibListFile; FileHandle_t hLibListFile;
@ -1057,7 +1022,6 @@ HMODULE LoadWindowsDLL(LPCSTR lpLibFileName)
} }
#endif //_WIN32 #endif //_WIN32
/* <8de05> ../engine/sys_dll.c:1884 */
void LoadThisDll(const char *szDllFilename) void LoadThisDll(const char *szDllFilename)
{ {
#ifdef _WIN32 #ifdef _WIN32
@ -1120,7 +1084,6 @@ IgnoreThisDLL:
} }
} }
/* <8dba1> ../engine/sys_dll.c:1958 */
void ReleaseEntityDlls(void) void ReleaseEntityDlls(void)
{ {
extensiondll_t *pextdll; extensiondll_t *pextdll;
@ -1130,7 +1093,7 @@ void ReleaseEntityDlls(void)
return; return;
FreeAllEntPrivateData(); FreeAllEntPrivateData();
if (gNewDLLFunctions.pfnGameShutdown) if (gNewDLLFunctions.pfnGameShutdown)
gNewDLLFunctions.pfnGameShutdown(); gNewDLLFunctions.pfnGameShutdown();
@ -1158,13 +1121,11 @@ void ReleaseEntityDlls(void)
g_psvs.dll_initialized = FALSE; g_psvs.dll_initialized = FALSE;
} }
/* <8ddcb> ../engine/sys_dll.c:2006 */
void EXT_FUNC EngineFprintf(void *pfile, const char *szFmt, ...) void EXT_FUNC EngineFprintf(void *pfile, const char *szFmt, ...)
{ {
AlertMessage(at_console, "EngineFprintf: Obsolete API\n"); AlertMessage(at_console, "EngineFprintf: Obsolete API\n");
} }
/* <8dd6f> ../engine/sys_dll.c:2022 */
void EXT_FUNC AlertMessage(ALERT_TYPE atype, const char *szFmt, ...) void EXT_FUNC AlertMessage(ALERT_TYPE atype, const char *szFmt, ...)
{ {
va_list argptr; va_list argptr;
@ -1209,7 +1170,6 @@ void EXT_FUNC AlertMessage(ALERT_TYPE atype, const char *szFmt, ...)
va_end(argptr); va_end(argptr);
} }
/* <8dbdc> ../engine/sys_dll.c:2198 */
NOXREF void Sys_SplitPath(const char *path, char *drive, char *dir, char *fname, char *ext) NOXREF void Sys_SplitPath(const char *path, char *drive, char *dir, char *fname, char *ext)
{ {
#ifdef _WIN32 #ifdef _WIN32
@ -1287,7 +1247,6 @@ NOXREF void Sys_SplitPath(const char *path, char *drive, char *dir, char *fname,
#endif // _WIN32 #endif // _WIN32
} }
/* <8d0c6> ../engine/sys_dll.c:2344 */
void Con_Debug_f(void) void Con_Debug_f(void)
{ {
if (con_debuglog) if (con_debuglog)
@ -1302,7 +1261,6 @@ void Con_Debug_f(void)
} }
} }
/* <8e069> ../engine/sys_dll.c:2364 */
void Con_Init(void) void Con_Init(void)
{ {
con_debuglog = COM_CheckParm("-condebug"); con_debuglog = COM_CheckParm("-condebug");
@ -1315,7 +1273,6 @@ void Con_Init(void)
#endif #endif
} }
/* <8dc81> ../engine/sys_dll.c:2385 */
void Con_DebugLog(const char *file, const char *fmt, ...) void Con_DebugLog(const char *file, const char *fmt, ...)
{ {
va_list argptr; va_list argptr;
@ -1343,7 +1300,6 @@ void Con_DebugLog(const char *file, const char *fmt, ...)
#endif // _WIN32 #endif // _WIN32
} }
/* <8dcfd> ../engine/sys_dll.c:2407 */
void EXT_FUNC Con_Printf(const char *fmt, ...) void EXT_FUNC Con_Printf(const char *fmt, ...)
{ {
char Dest[4096]; char Dest[4096];
@ -1389,7 +1345,6 @@ void EXT_FUNC Con_Printf(const char *fmt, ...)
} }
} }
/* <8dfae> ../engine/sys_dll.c:2442 */
void Con_SafePrintf(const char *fmt, ...) void Con_SafePrintf(const char *fmt, ...)
{ {
va_list argptr; va_list argptr;
@ -1407,7 +1362,6 @@ void Con_SafePrintf(const char *fmt, ...)
#endif // _WIN32 #endif // _WIN32
} }
/* <8e00b> ../engine/sys_dll.c:2459 */
#if defined(REHLDS_FIXES) && defined(REHLDS_FLIGHT_REC) #if defined(REHLDS_FIXES) && defined(REHLDS_FLIGHT_REC)
// Always print debug logs to the flight recorder // Always print debug logs to the flight recorder
void EXT_FUNC Con_DPrintf(const char *fmt, ...) void EXT_FUNC Con_DPrintf(const char *fmt, ...)
@ -1433,7 +1387,7 @@ void EXT_FUNC Con_DPrintf(const char *fmt, ...)
} }
} }
#else //defined(REHLDS_FIXES) and defined(REHLDS_FLIGHT_REC) #else // defined(REHLDS_FIXES) and defined(REHLDS_FLIGHT_REC)
void EXT_FUNC Con_DPrintf(const char *fmt, ...) void EXT_FUNC Con_DPrintf(const char *fmt, ...)
{ {

49
rehlds/engine/sys_dll2.cpp
View File

@ -33,9 +33,6 @@ qboolean g_bIsWin95;
qboolean g_bIsWin98; qboolean g_bIsWin98;
double g_flLastSteamProgressUpdateTime; double g_flLastSteamProgressUpdateTime;
//CEngineAPI __g_CEngineAPI_singleton;
//InterfaceReg __g_CreateCEngineAPIIEngineAPI_reg;
/* /*
* Globals initialization * Globals initialization
*/ */
@ -45,18 +42,14 @@ char *szCommonPreloads = "multiplayer_preloads";
char *szReslistsBaseDir = "reslists"; char *szReslistsBaseDir = "reslists";
char *szReslistsExt = ".lst"; char *szReslistsExt = ".lst";
#else //HOOK_ENGINE #else // HOOK_ENGINE
char *szCommonPreloads; char *szCommonPreloads;
char *szReslistsBaseDir; char *szReslistsBaseDir;
char *szReslistsExt; char *szReslistsExt;
#endif //HOOK_ENGINE #endif // HOOK_ENGINE
//CDedicatedServerAPI __g_CDedicatedServerAPI_singleton;
//InterfaceReg __g_CreateCDedicatedServerAPIIDedicatedServerAPI_reg
/* <8fce7> ../engine/sys_dll2.cpp:150 */
const char *GetCurrentSteamAppName(void) const char *GetCurrentSteamAppName(void)
{ {
if (!Q_stricmp(com_gamedir, "cstrike") || !Q_stricmp(com_gamedir, "cstrike_beta")) if (!Q_stricmp(com_gamedir, "cstrike") || !Q_stricmp(com_gamedir, "cstrike_beta"))
@ -83,19 +76,16 @@ const char *GetCurrentSteamAppName(void)
return "Half-Life"; return "Half-Life";
} }
/* <90345> ../engine/sys_dll2.cpp:184 */
NOXREF void SetRateRegistrySetting(const char *pchRate) NOXREF void SetRateRegistrySetting(const char *pchRate)
{ {
registry->WriteString("rate", pchRate); registry->WriteString("rate", pchRate);
} }
/* <9036c> ../engine/sys_dll2.cpp:189 */
NOXREF const char *GetRateRegistrySetting(const char *pchDef) NOXREF const char *GetRateRegistrySetting(const char *pchDef)
{ {
return registry->ReadString("rate", pchDef); return registry->ReadString("rate", pchDef);
} }
/* <90397> ../engine/sys_dll2.cpp:198 */
void EXPORT F(IEngineAPI **api) void EXPORT F(IEngineAPI **api)
{ {
CreateInterfaceFn fn; CreateInterfaceFn fn;
@ -103,7 +93,6 @@ void EXPORT F(IEngineAPI **api)
*api = (IEngineAPI *)fn("VENGINE_LAUNCHER_API_VERSION002", NULL); *api = (IEngineAPI *)fn("VENGINE_LAUNCHER_API_VERSION002", NULL);
} }
/* <903c2> ../engine/sys_dll2.cpp:245 */
void Sys_GetCDKey(char *pszCDKey, int *nLength, int *bDedicated) void Sys_GetCDKey(char *pszCDKey, int *nLength, int *bDedicated)
{ {
char key[65]; char key[65];
@ -143,12 +132,10 @@ void Sys_GetCDKey(char *pszCDKey, int *nLength, int *bDedicated)
*bDedicated = 0; *bDedicated = 0;
} }
/* <9049d> ../engine/sys_dll2.cpp:287 */
NOXREF void Legacy_ErrorMessage(int nLevel, const char *pszErrorMessage) NOXREF void Legacy_ErrorMessage(int nLevel, const char *pszErrorMessage)
{ {
} }
/* <90286> ../engine/sys_dll2.cpp:291 */
void Legacy_Sys_Printf(char *fmt, ...) void Legacy_Sys_Printf(char *fmt, ...)
{ {
va_list argptr; va_list argptr;
@ -162,17 +149,14 @@ void Legacy_Sys_Printf(char *fmt, ...)
dedicated_->Sys_Printf(text); dedicated_->Sys_Printf(text);
} }
/* <904d8> ../engine/sys_dll2.cpp:307 */
NOXREF void Legacy_MP3subsys_Suspend_Audio(void) NOXREF void Legacy_MP3subsys_Suspend_Audio(void)
{ {
} }
/* <904f0> ../engine/sys_dll2.cpp:311 */
NOXREF void Legacy_MP3subsys_Resume_Audio(void) NOXREF void Legacy_MP3subsys_Resume_Audio(void)
{ {
} }
/* <90508> ../engine/sys_dll2.cpp:315 */
void Sys_SetupLegacyAPIs(void) void Sys_SetupLegacyAPIs(void)
{ {
#ifndef SWDS #ifndef SWDS
@ -182,7 +166,6 @@ void Sys_SetupLegacyAPIs(void)
Launcher_ConsolePrintf = Legacy_Sys_Printf; Launcher_ConsolePrintf = Legacy_Sys_Printf;
} }
/* <90518> ../engine/sys_dll2.cpp:335 */
NOXREF int Sys_IsWin95(void) NOXREF int Sys_IsWin95(void)
{ {
#ifdef _WIN32 #ifdef _WIN32
@ -193,7 +176,6 @@ NOXREF int Sys_IsWin95(void)
#endif // _WIN32 #endif // _WIN32
} }
/* <90534> ../engine/sys_dll2.cpp:340 */
NOXREF int Sys_IsWin98(void) NOXREF int Sys_IsWin98(void)
{ {
#ifdef _WIN32 #ifdef _WIN32
@ -204,7 +186,6 @@ NOXREF int Sys_IsWin98(void)
#endif // _WIN32 #endif // _WIN32
} }
/* <90550> ../engine/sys_dll2.cpp:348 */
#ifdef _WIN32 #ifdef _WIN32
NOXREF void Sys_CheckOSVersion(void) NOXREF void Sys_CheckOSVersion(void)
{ {
@ -231,7 +212,6 @@ NOXREF void Sys_CheckOSVersion(void)
} }
#endif // _WIN32 #endif // _WIN32
/* <8fd53> ../engine/sys_dll2.cpp:397 */
void Sys_Init(void) void Sys_Init(void)
{ {
#ifndef SWDS #ifndef SWDS
@ -239,7 +219,6 @@ void Sys_Init(void)
#endif #endif
} }
/* <8fd7b> ../engine/sys_dll2.cpp:445 */
void Sys_Shutdown(void) void Sys_Shutdown(void)
{ {
#ifndef SWDS #ifndef SWDS
@ -260,7 +239,6 @@ void Sys_Shutdown(void)
#endif // _WIN32 #endif // _WIN32
} }
/* <90588> ../engine/sys_dll2.cpp:475 */
void Sys_InitArgv(char *lpCmdLine) void Sys_InitArgv(char *lpCmdLine)
{ {
static char *argv[MAX_COMMAND_LINE_PARAMS]; static char *argv[MAX_COMMAND_LINE_PARAMS];
@ -337,12 +315,10 @@ void Sys_InitArgv(char *lpCmdLine)
host_parms.argv = com_argv; host_parms.argv = com_argv;
} }
/* <8fd20> ../engine/sys_dll2.cpp:514 */
NOXREF void Sys_ShutdownArgv(void) NOXREF void Sys_ShutdownArgv(void)
{ {
} }
/* <9066a> ../engine/sys_dll2.cpp:530 */
void Sys_InitMemory(void) void Sys_InitMemory(void)
{ {
int i; int i;
@ -392,7 +368,6 @@ void Sys_InitMemory(void)
Sys_Error("Unable to allocate %.2f MB\n", (float)host_parms.memsize / (1024.0f * 1024.0f)); Sys_Error("Unable to allocate %.2f MB\n", (float)host_parms.memsize / (1024.0f * 1024.0f));
} }
/* <906c2> ../engine/sys_dll2.cpp:626 */
void Sys_ShutdownMemory(void) void Sys_ShutdownMemory(void)
{ {
#ifdef _WIN32 #ifdef _WIN32
@ -404,7 +379,6 @@ void Sys_ShutdownMemory(void)
host_parms.memsize = 0; host_parms.memsize = 0;
} }
/* <906dd> ../engine/sys_dll2.cpp:644 */
void Sys_InitLauncherInterface(void) void Sys_InitLauncherInterface(void)
{ {
#ifdef _WIN32 #ifdef _WIN32
@ -419,23 +393,19 @@ void Sys_InitLauncherInterface(void)
#endif // _WIN32 #endif // _WIN32
} }
/* <90702> ../engine/sys_dll2.cpp:666 */
NOXREF void Sys_ShutdownLauncherInterface(void) NOXREF void Sys_ShutdownLauncherInterface(void)
{ {
} }
/* <90712> ../engine/sys_dll2.cpp:673 */
void Sys_InitAuthentication(void) void Sys_InitAuthentication(void)
{ {
Sys_Printf("STEAM Auth Server\r\n"); Sys_Printf("STEAM Auth Server\r\n");
} }
/* <8fd71> ../engine/sys_dll2.cpp:678 */
NOXREF void Sys_ShutdownAuthentication(void) NOXREF void Sys_ShutdownAuthentication(void)
{ {
} }
/* <9073d> ../engine/sys_dll2.cpp:694 */
void Sys_ShowProgressTicks(char *specialProgressMsg) void Sys_ShowProgressTicks(char *specialProgressMsg)
{ {
static bool recursionGuard = false; static bool recursionGuard = false;
@ -485,7 +455,6 @@ void Sys_ShowProgressTicks(char *specialProgressMsg)
} }
} }
/* <907de> ../engine/sys_dll2.cpp:748 */
int Sys_InitGame(char *lpOrgCmdLine, char *pBaseDir, void *pwnd, int bIsDedicated) int Sys_InitGame(char *lpOrgCmdLine, char *pBaseDir, void *pwnd, int bIsDedicated)
{ {
host_initialized = FALSE; host_initialized = FALSE;
@ -560,7 +529,6 @@ int Sys_InitGame(char *lpOrgCmdLine, char *pBaseDir, void *pwnd, int bIsDedicate
return 1; return 1;
} }
/* <90871> ../engine/sys_dll2.cpp:841 */
void Sys_ShutdownGame(void) void Sys_ShutdownGame(void)
{ {
if (!g_bIsDedicatedServer) if (!g_bIsDedicatedServer)
@ -580,7 +548,6 @@ void Sys_ShutdownGame(void)
Sys_Shutdown(); Sys_Shutdown();
} }
/* <9089f> ../engine/sys_dll2.cpp:869 */
void ClearIOStates(void) void ClearIOStates(void)
{ {
#ifndef SWDS #ifndef SWDS
@ -595,20 +562,18 @@ void ClearIOStates(void)
} }
/* <8f74a> ../engine/sys_dll2.cpp:982 */
class CEngineAPI : public IEngineAPI class CEngineAPI : public IEngineAPI
{ {
public: public:
/* <8f797> ../engine/sys_dll2.cpp:1004 */
int Run(void *instance, char *basedir, char *cmdline, char *postRestartCmdLineArgs, CreateInterfaceFn launcherFactory, CreateInterfaceFn filesystemFactory) int Run(void *instance, char *basedir, char *cmdline, char *postRestartCmdLineArgs, CreateInterfaceFn launcherFactory, CreateInterfaceFn filesystemFactory)
{ {
return 0; return 0;
} }
}; };
static CEngineAPI g_CEngineAPI; CEngineAPI g_CEngineAPI;
/* <8ff0c> ../engine/sys_dll2.cpp:1034 */
IBaseInterface *CreateCEngineAPI(void) IBaseInterface *CreateCEngineAPI(void)
{ {
return &g_CEngineAPI; return &g_CEngineAPI;
@ -616,8 +581,8 @@ IBaseInterface *CreateCEngineAPI(void)
InterfaceReg g_CreateCEngineAPI = InterfaceReg(CreateCEngineAPI, "VENGINE_LAUNCHER_API_VERSION002"); InterfaceReg g_CreateCEngineAPI = InterfaceReg(CreateCEngineAPI, "VENGINE_LAUNCHER_API_VERSION002");
/* <908b7> ../engine/sys_dll2.cpp:1070 */ // TODO: Needs rechecking
/* Needs rechecking /*
NOXREF int BuildMapCycleListHints(char **hints) NOXREF int BuildMapCycleListHints(char **hints)
{ {
char szMap[262]; char szMap[262];
@ -784,5 +749,5 @@ void CDedicatedServerAPI::UpdateStatus_noVirt(float *fps, int *nActive, int *nMa
EXPOSE_SINGLE_INTERFACE(CDedicatedServerAPI, IDedicatedServerAPI, VENGINE_HLDS_API_VERSION); EXPOSE_SINGLE_INTERFACE(CDedicatedServerAPI, IDedicatedServerAPI, VENGINE_HLDS_API_VERSION);
#endif //HOOK_ENGINE #endif // HOOK_ENGINE

65
rehlds/engine/sys_dll2.h
View File

@ -65,67 +65,60 @@ extern char *szCommonPreloads;
extern char *szReslistsBaseDir; extern char *szReslistsBaseDir;
extern char *szReslistsExt; extern char *szReslistsExt;
class CDedicatedServerAPI : public IDedicatedServerAPI class CDedicatedServerAPI: public IDedicatedServerAPI
{ {
private: private:
char m_OrigCmd[1024]; char m_OrigCmd[1024];
public: public:
virtual bool Init(char *basedir, char *cmdline, CreateInterfaceFn launcherFactory, CreateInterfaceFn filesystemFactory); virtual bool Init(char *basedir, char *cmdline, CreateInterfaceFn launcherFactory, CreateInterfaceFn filesystemFactory);
bool Init_noVirt(char *basedir, char *cmdline, CreateInterfaceFn launcherFactory, CreateInterfaceFn filesystemFactory); virtual int Shutdown();
virtual bool RunFrame();
virtual int Shutdown(void);
int Shutdown_noVirt(void);
virtual bool RunFrame(void);
bool RunFrame_noVirt(void);
virtual void AddConsoleText(char *text); virtual void AddConsoleText(char *text);
void AddConsoleText_noVirt(char *text);
virtual void UpdateStatus(float *fps, int *nActive, int *nMaxPlayers, char *pszMap); virtual void UpdateStatus(float *fps, int *nActive, int *nMaxPlayers, char *pszMap);
// non-virtual function's of wrap for hooks a virtual
// Only need to HOOK_ENGINE
bool Init_noVirt(char *basedir, char *cmdline, CreateInterfaceFn launcherFactory, CreateInterfaceFn filesystemFactory);
int Shutdown_noVirt();
bool RunFrame_noVirt();
void AddConsoleText_noVirt(char *text);
void UpdateStatus_noVirt(float *fps, int *nActive, int *nMaxPlayers, char *pszMap); void UpdateStatus_noVirt(float *fps, int *nActive, int *nMaxPlayers, char *pszMap);
}; };
const char *GetCurrentSteamAppName(void); const char *GetCurrentSteamAppName();
NOXREF void SetRateRegistrySetting(const char *pchRate); NOXREF void SetRateRegistrySetting(const char *pchRate);
NOXREF const char *GetRateRegistrySetting(const char *pchDef); NOXREF const char *GetRateRegistrySetting(const char *pchDef);
void EXPORT F(IEngineAPI **api); void EXPORT F(IEngineAPI **api);
void Sys_GetCDKey(char *pszCDKey, int *nLength, int *bDedicated); void Sys_GetCDKey(char *pszCDKey, int *nLength, int *bDedicated);
NOXREF void Legacy_ErrorMessage(int nLevel, const char *pszErrorMessage); NOXREF void Legacy_ErrorMessage(int nLevel, const char *pszErrorMessage);
void Legacy_Sys_Printf(char *fmt, ...); void Legacy_Sys_Printf(char *fmt, ...);
NOXREF void Legacy_MP3subsys_Suspend_Audio(void); NOXREF void Legacy_MP3subsys_Suspend_Audio();
NOXREF void Legacy_MP3subsys_Resume_Audio(void); NOXREF void Legacy_MP3subsys_Resume_Audio();
void Sys_SetupLegacyAPIs(void); void Sys_SetupLegacyAPIs();
NOXREF int Sys_IsWin95(void); NOXREF int Sys_IsWin95();
NOXREF int Sys_IsWin98(void); NOXREF int Sys_IsWin98();
#ifdef _WIN32 #ifdef _WIN32
NOXREF void Sys_CheckOSVersion(void); NOXREF void Sys_CheckOSVersion();
#endif #endif
NOXREF void Sys_Init(void); NOXREF void Sys_Init();
NOXREF void Sys_Shutdown(void); NOXREF void Sys_Shutdown();
void Sys_InitArgv(char *lpCmdLine); void Sys_InitArgv(char *lpCmdLine);
NOXREF void Sys_ShutdownArgv(void); NOXREF void Sys_ShutdownArgv();
void Sys_InitMemory(void); void Sys_InitMemory();
void Sys_ShutdownMemory(void); void Sys_ShutdownMemory();
void Sys_InitLauncherInterface(void); void Sys_InitLauncherInterface();
NOXREF void Sys_ShutdownLauncherInterface(void); NOXREF void Sys_ShutdownLauncherInterface();
void Sys_InitAuthentication(void); void Sys_InitAuthentication();
NOXREF void Sys_ShutdownAuthentication(void); NOXREF void Sys_ShutdownAuthentication();
void Sys_ShowProgressTicks(char *specialProgressMsg); void Sys_ShowProgressTicks(char *specialProgressMsg);
int Sys_InitGame(char *lpOrgCmdLine, char *pBaseDir, void *pwnd, int bIsDedicated); int Sys_InitGame(char *lpOrgCmdLine, char *pBaseDir, void *pwnd, int bIsDedicated);
void Sys_ShutdownGame(void); void Sys_ShutdownGame();
void ClearIOStates(void); void ClearIOStates();
NOBODY class IBaseInterface *__CreateCEngineAPIIEngineAPI_interface(void); // TODO: Needs rechecking
// Needs rechecking
//NOXREF int BuildMapCycleListHints(char **hints); //NOXREF int BuildMapCycleListHints(char **hints);
NOBODY class IBaseInterface *__CreateCDedicatedServerAPIIDedicatedServerAPI_interface(void);
NOBODY void _GLOBAL__sub_I_D_SurfaceCacheForRes(void);
#endif // SYS_DLL2_H #endif // SYS_DLL2_H

16
rehlds/engine/sys_engine.cpp
View File

@ -42,7 +42,6 @@ IEngine *eng;
#endif // HOOK_ENGINE #endif // HOOK_ENGINE
/* <95a20> ../engine/sys_engine.cpp:145 */
CEngine::CEngine() CEngine::CEngine()
{ {
m_fFrameTime = 0.0; m_fFrameTime = 0.0;
@ -60,12 +59,10 @@ CEngine::CEngine()
#endif #endif
} }
/* <95a38> ../engine/sys_engine.cpp:164 */
CEngine::~CEngine() CEngine::~CEngine()
{ {
} }
/* <95a92> ../engine/sys_engine.cpp:171 */
void CEngine::Unload() void CEngine::Unload()
{ {
Unload_noVirt(); Unload_noVirt();
@ -162,7 +159,6 @@ int CEngine::Frame_noVirt()
return m_nDLLState; return m_nDLLState;
} }
/* <96468> ../engine/sys_engine.cpp:274 */
void CEngine::SetSubState(int iSubState) void CEngine::SetSubState(int iSubState)
{ {
SetSubState_noVirt(iSubState); SetSubState_noVirt(iSubState);
@ -174,7 +170,6 @@ void CEngine::SetSubState_noVirt(int iSubState)
GameSetSubState(iSubState); GameSetSubState(iSubState);
} }
/* <96433> ../engine/sys_engine.cpp:286 */
void CEngine::SetState(int iState) void CEngine::SetState(int iState)
{ {
SetState_noVirt(iState); SetState_noVirt(iState);
@ -186,7 +181,6 @@ void CEngine::SetState_noVirt(int iState)
GameSetState(iState); GameSetState(iState);
} }
/* <95ae0> ../engine/sys_engine.cpp:296 */
int CEngine::GetState() int CEngine::GetState()
{ {
return GetState_noVirt(); return GetState_noVirt();
@ -197,7 +191,6 @@ int CEngine::GetState_noVirt()
return m_nDLLState; return m_nDLLState;
} }
/* <95b33> ../engine/sys_engine.cpp:305 */
int CEngine::GetSubState() int CEngine::GetSubState()
{ {
return GetSubState_noVirt(); return GetSubState_noVirt();
@ -208,7 +201,6 @@ int CEngine::GetSubState_noVirt()
return m_nSubState; return m_nSubState;
} }
/* <95b84> ../engine/sys_engine.cpp:314 */
double CEngine::GetFrameTime() double CEngine::GetFrameTime()
{ {
return GetFrameTime_noVirt(); return GetFrameTime_noVirt();
@ -219,7 +211,6 @@ double CEngine::GetFrameTime_noVirt()
return m_fFrameTime; return m_fFrameTime;
} }
/* <95bad> ../engine/sys_engine.cpp:323 */
double CEngine::GetCurTime() double CEngine::GetCurTime()
{ {
return GetCurTime_noVirt(); return GetCurTime_noVirt();
@ -230,7 +221,6 @@ double CEngine::GetCurTime_noVirt()
return m_fCurTime; return m_fCurTime;
} }
/* <96348> ../engine/sys_engine.cpp:333 */
void CEngine::TrapKey_Event(int key, bool down) void CEngine::TrapKey_Event(int key, bool down)
{ {
TrapKey_Event_noVirt(key, down); TrapKey_Event_noVirt(key, down);
@ -240,7 +230,6 @@ void CEngine::TrapKey_Event_noVirt(int key, bool down)
{ {
} }
/* <960ca> ../engine/sys_engine.cpp:356 */
void CEngine::TrapMouse_Event(int buttons, bool down) void CEngine::TrapMouse_Event(int buttons, bool down)
{ {
TrapMouse_Event_noVirt(buttons, down); TrapMouse_Event_noVirt(buttons, down);
@ -261,7 +250,6 @@ void CEngine::TrapMouse_Event_noVirt(int buttons, bool down)
} }
} }
/* <95c34> ../engine/sys_engine.cpp:376 */
void CEngine::StartTrapMode() void CEngine::StartTrapMode()
{ {
StartTrapMode_noVirt(); StartTrapMode_noVirt();
@ -276,7 +264,6 @@ void CEngine::StartTrapMode_noVirt()
} }
} }
/* <95c59> ../engine/sys_engine.cpp:389 */
bool CEngine::IsTrapping() bool CEngine::IsTrapping()
{ {
return IsTrapping_noVirt(); return IsTrapping_noVirt();
@ -287,7 +274,6 @@ bool CEngine::IsTrapping_noVirt()
return m_bTrapMode; return m_bTrapMode;
} }
/* <96100> ../engine/sys_engine.cpp:400 */
bool CEngine::CheckDoneTrapping(int & buttons, int & key) bool CEngine::CheckDoneTrapping(int & buttons, int & key)
{ {
return CheckDoneTrapping_noVirt(buttons, key); return CheckDoneTrapping_noVirt(buttons, key);
@ -312,7 +298,6 @@ bool CEngine::CheckDoneTrapping_noVirt(int & buttons, int & key)
} }
} }
/* <963d8> ../engine/sys_engine.cpp:419 */
void CEngine::SetQuitting(int quittype) void CEngine::SetQuitting(int quittype)
{ {
SetQuitting_noVirt(quittype); SetQuitting_noVirt(quittype);
@ -323,7 +308,6 @@ void CEngine::SetQuitting_noVirt(int quittype)
m_nQuitting = quittype; m_nQuitting = quittype;
} }
/* <9640d> ../engine/sys_engine.cpp:427 */
int CEngine::GetQuitting() int CEngine::GetQuitting()
{ {
return GetQuitting_noVirt(); return GetQuitting_noVirt();

100
rehlds/engine/sys_engine.h
View File

@ -45,97 +45,57 @@
extern IGame* game; extern IGame* game;
extern IEngine* eng; extern IEngine* eng;
class CEngine: public IEngine
/* <95955> ../engine/sys_engine.cpp:92 */
class CEngine : public IEngine
{ {
private: private:
int m_nQuitting;
int m_nQuitting; /* 4 4 */ int m_nDLLState;
int m_nDLLState; /* 8 4 */ int m_nSubState;
int m_nSubState; /* 12 4 */ double m_fCurTime;
double m_fCurTime; /* 16 8 */ double m_fFrameTime;
double m_fFrameTime; /* 24 8 */ double m_fOldTime;
double m_fOldTime; /* 32 8 */ bool m_bTrapMode;
bool m_bTrapMode; /* 40 1 */ bool m_bDoneTrapping;
bool m_bDoneTrapping; /* 41 1 */ int m_nTrapKey;
int m_nTrapKey; /* 44 4 */ int m_nTrapButtons;
int m_nTrapButtons; /* 48 4 */
public: public:
CEngine(); CEngine();
virtual ~CEngine(); virtual ~CEngine();
virtual bool Load(bool dedicated, char *rootDir, char *cmdLine); virtual bool Load(bool dedicated, char *rootDir, char *cmdLine);
bool Load_noVirt(bool dedicated, char *rootDir, char *cmdLine);
virtual void Unload(); virtual void Unload();
void Unload_noVirt();
virtual void SetState(int iState); virtual void SetState(int iState);
void SetState_noVirt(int iState);
virtual int GetState(); virtual int GetState();
int GetState_noVirt();
virtual void SetSubState(int iSubstate); virtual void SetSubState(int iSubstate);
void SetSubState_noVirt(int iSubstate);
virtual int GetSubState(); virtual int GetSubState();
int GetSubState_noVirt();
virtual int Frame(); virtual int Frame();
int Frame_noVirt();
virtual double GetFrameTime(); virtual double GetFrameTime();
double GetFrameTime_noVirt();
virtual double GetCurTime(); virtual double GetCurTime();
double GetCurTime_noVirt();
virtual void TrapKey_Event(int key, bool down); virtual void TrapKey_Event(int key, bool down);
void TrapKey_Event_noVirt(int key, bool down);
virtual void TrapMouse_Event(int buttons, bool down); virtual void TrapMouse_Event(int buttons, bool down);
void TrapMouse_Event_noVirt(int buttons, bool down);
virtual void StartTrapMode(); virtual void StartTrapMode();
void StartTrapMode_noVirt();
virtual bool IsTrapping(); virtual bool IsTrapping();
bool IsTrapping_noVirt();
virtual bool CheckDoneTrapping(int& buttons, int& keys); virtual bool CheckDoneTrapping(int& buttons, int& keys);
bool CheckDoneTrapping_noVirt(int& buttons, int& keys);
virtual int GetQuitting(); virtual int GetQuitting();
int GetQuitting_noVirt();
virtual void SetQuitting(int quittype); virtual void SetQuitting(int quittype);
// non-virtual function's of wrap for hooks a virtual
// Only need to HOOK_ENGINE
bool Load_noVirt(bool dedicated, char *rootDir, char *cmdLine);
void Unload_noVirt();
void SetState_noVirt(int iState);
int GetState_noVirt();
void SetSubState_noVirt(int iSubstate);
int GetSubState_noVirt();
int Frame_noVirt();
double GetFrameTime_noVirt();
double GetCurTime_noVirt();
void TrapKey_Event_noVirt(int key, bool down);
void TrapMouse_Event_noVirt(int buttons, bool down);
void StartTrapMode_noVirt();
bool IsTrapping_noVirt();
bool CheckDoneTrapping_noVirt(int& buttons, int& keys);
int GetQuitting_noVirt();
void SetQuitting_noVirt(int quittype); void SetQuitting_noVirt(int quittype);
};
/* vtable has 16 entries: {
[2] = Load(_ZN7CEngine4LoadEbPcS0_),
[3] = Unload(_ZN7CEngine6UnloadEv),
[4] = SetState(_ZN7CEngine8SetStateEi),
[5] = GetState(_ZN7CEngine8GetStateEv),
[6] = SetSubState(_ZN7CEngine11SetSubStateEi),
[7] = GetSubState(_ZN7CEngine11GetSubStateEv),
[8] = Frame(_ZN7CEngine5FrameEv),
[9] = GetFrameTime(_ZN7CEngine12GetFrameTimeEv),
[10] = GetCurTime(_ZN7CEngine10GetCurTimeEv),
[11] = TrapKey_Event(_ZN7CEngine13TrapKey_EventEib),
[12] = TrapMouse_Event(_ZN7CEngine15TrapMouse_EventEib),
[13] = StartTrapMode(_ZN7CEngine13StartTrapModeEv),
[14] = IsTrapping(_ZN7CEngine10IsTrappingEv),
[15] = CheckDoneTrapping(_ZN7CEngine17CheckDoneTrappingERiS0_),
[16] = GetQuitting(_ZN7CEngine11GetQuittingEv),
[17] = SetQuitting(_ZN7CEngine11SetQuittingEi),
} */
/* size: 52, cachelines: 1, members: 11 */
/* last cacheline: 52 bytes */
/* BRAIN FART ALERT! 52 != 50 + 0(holes), diff = 2 */
}; /* size: 52 */

10
rehlds/engine/sys_linuxwind.cpp
View File

@ -36,11 +36,11 @@
CGame g_Game; CGame g_Game;
IGame *game = &g_Game; IGame *game = &g_Game;
#else //HOOK_ENGINE #else // HOOK_ENGINE
IGame *game; IGame *game;
#endif //HOOK_ENGINE #endif // HOOK_ENGINE
CGame::CGame() CGame::CGame()
{ {
@ -184,11 +184,11 @@ void CGame::PlayAVIAndWait_noVirt(const char *aviFile)
{ {
} }
void CGame::SetCursorVisible(bool vis) void CGame::SetCursorVisible(bool bState)
{ {
SetCursorVisible_noVirt(vis); SetCursorVisible_noVirt(bState);
} }
void CGame::SetCursorVisible_noVirt(bool vis) void CGame::SetCursorVisible_noVirt(bool bState)
{ {
} }

52
rehlds/engine/sys_linuxwnd.h
View File

@ -31,55 +31,43 @@
#include "maintypes.h" #include "maintypes.h"
#include "igame.h" #include "igame.h"
class CGame : public IGame { class CGame: public IGame {
private: private:
bool m_bActiveApp; /* 4 1 */ bool m_bActiveApp;
public: public:
CGame(); CGame();
virtual ~CGame(); virtual ~CGame();
virtual bool Init(void *pvInstance); virtual bool Init(void *pvInstance);
bool Init_noVirt(void *pvInstance);
virtual bool Shutdown(); virtual bool Shutdown();
bool Shutdown_noVirt();
virtual bool CreateGameWindow(); virtual bool CreateGameWindow();
bool CreateGameWindow_noVirt();
virtual void SleepUntilInput(int time); virtual void SleepUntilInput(int time);
void SleepUntilInput_noVirt(int time);
virtual HWND GetMainWindow(); virtual HWND GetMainWindow();
HWND GetMainWindow_noVirt();
virtual HWND * GetMainWindowAddress(); virtual HWND * GetMainWindowAddress();
HWND * GetMainWindowAddress_noVirt();
virtual void SetWindowXY(int x, int y); virtual void SetWindowXY(int x, int y);
void SetWindowXY_noVirt(int x, int y);
virtual void SetWindowSize(int w, int h); virtual void SetWindowSize(int w, int h);
void SetWindowSize_noVirt(int w, int h);
virtual void GetWindowRect(int *x, int *y, int *w, int *h); virtual void GetWindowRect(int *x, int *y, int *w, int *h);
void GetWindowRect_noVirt(int *x, int *y, int *w, int *h);
virtual bool IsActiveApp(); virtual bool IsActiveApp();
bool IsActiveApp_noVirt();
virtual bool IsMultiplayer(); virtual bool IsMultiplayer();
bool IsMultiplayer_noVirt();
virtual void PlayStartupVideos(); virtual void PlayStartupVideos();
void PlayStartupVideos_noVirt();
virtual void PlayAVIAndWait(const char *aviFile); virtual void PlayAVIAndWait(const char *aviFile);
void PlayAVIAndWait_noVirt(const char *aviFile); virtual void SetCursorVisible(bool bState);
virtual void SetCursorVisible(bool vis); // non-virtual function's of wrap for hooks a virtual
void SetCursorVisible_noVirt(bool vis); // Only need to HOOK_ENGINE
bool Init_noVirt(void *pvInstance);
bool Shutdown_noVirt();
bool CreateGameWindow_noVirt();
void SleepUntilInput_noVirt(int time);
HWND GetMainWindow_noVirt();
HWND * GetMainWindowAddress_noVirt();
void SetWindowXY_noVirt(int x, int y);
void SetWindowSize_noVirt(int w, int h);
void GetWindowRect_noVirt(int *x, int *y, int *w, int *h);
bool IsActiveApp_noVirt();
bool IsMultiplayer_noVirt();
void PlayStartupVideos_noVirt();
void PlayAVIAndWait_noVirt(const char *aviFile);
void SetCursorVisible_noVirt(bool bState);
}; };

25
rehlds/engine/textures.cpp
View File

@ -28,9 +28,8 @@
#include "precompiled.h" #include "precompiled.h"
texlumpinfo_t* lumpinfo;
texlumpinfo_t* lumpinfo; int nTexLumps;
int nTexLumps;
FILE* texfiles[128]; FILE* texfiles[128];
int nTexFiles; int nTexFiles;
@ -40,8 +39,6 @@ texture_t * r_notexture_mip;
int nummiptex; int nummiptex;
char miptex[512][64]; char miptex[512][64];
/* /*
* Globals initialization * Globals initialization
*/ */
@ -49,13 +46,12 @@ char miptex[512][64];
cvar_t r_wadtextures = { "r_wadtextures", "0", 0, 0.0f, NULL }; cvar_t r_wadtextures = { "r_wadtextures", "0", 0, 0.0f, NULL };
#else //HOOK_ENGINE #else // HOOK_ENGINE
cvar_t r_wadtextures; cvar_t r_wadtextures;
#endif //HOOK_ENGINE #endif // HOOK_ENGINE
/* <c61e8> ../engine/textures.c:35 */
void SafeRead(FileHandle_t f, void *buffer, int count) void SafeRead(FileHandle_t f, void *buffer, int count)
{ {
if (FS_Read(buffer, count, 1, f) != count) if (FS_Read(buffer, count, 1, f) != count)
@ -75,7 +71,6 @@ void CleanupName(char *in, char *out)
} }
} }
/* <c616d> ../engine/textures.c:64 */
int lump_sorter(const void *lump1, const void *lump2) int lump_sorter(const void *lump1, const void *lump2)
{ {
const texlumpinfo_t *plump1 = (const texlumpinfo_t *)lump1; const texlumpinfo_t *plump1 = (const texlumpinfo_t *)lump1;
@ -83,7 +78,6 @@ int lump_sorter(const void *lump1, const void *lump2)
return Q_strcmp(plump1->lump.name, plump2->lump.name); return Q_strcmp(plump1->lump.name, plump2->lump.name);
} }
/* <c6153> ../engine/textures.c:72 */
void ForwardSlashes(char *pname) void ForwardSlashes(char *pname)
{ {
while (*pname) { while (*pname) {
@ -94,7 +88,6 @@ void ForwardSlashes(char *pname)
} }
} }
/* <c62da> ../engine/textures.c:87 */
qboolean TEX_InitFromWad(char *path) qboolean TEX_InitFromWad(char *path)
{ {
char *pszWadFile; char *pszWadFile;
@ -149,13 +142,12 @@ qboolean TEX_InitFromWad(char *path)
lumpinfo[nTexLumps].lump.disksize = LittleLong(lumpinfo[nTexLumps].lump.disksize);; lumpinfo[nTexLumps].lump.disksize = LittleLong(lumpinfo[nTexLumps].lump.disksize);;
lumpinfo[nTexLumps].iTexFile = nTexFiles - 1; lumpinfo[nTexLumps].iTexFile = nTexFiles - 1;
} }
} }
qsort(lumpinfo, nTexLumps, sizeof(texlumpinfo_t), lump_sorter); qsort(lumpinfo, nTexLumps, sizeof(texlumpinfo_t), lump_sorter);
return 1; return 1;
} }
/* <c644f> ../engine/textures.c:178 */
void TEX_CleanupWadInfo(void) void TEX_CleanupWadInfo(void)
{ {
if (lumpinfo) if (lumpinfo)
@ -174,7 +166,6 @@ void TEX_CleanupWadInfo(void)
nTexFiles = 0; nTexFiles = 0;
} }
/* <c6476> ../engine/textures.c:203 */
int TEX_LoadLump(char *name, unsigned char *dest) int TEX_LoadLump(char *name, unsigned char *dest)
{ {
texlumpinfo_t *found; texlumpinfo_t *found;
@ -195,10 +186,9 @@ int TEX_LoadLump(char *name, unsigned char *dest)
} }
} }
/* <c653c> ../engine/textures.c:220 */
int FindMiptex(char *name) int FindMiptex(char *name)
{ {
int i = 0; // 222 int i = 0;
for (i = 0; i < nummiptex; i++) for (i = 0; i < nummiptex; i++)
{ {
if (!Q_stricmp(name, miptex[i])) if (!Q_stricmp(name, miptex[i]))
@ -214,7 +204,6 @@ int FindMiptex(char *name)
return i; return i;
} }
/* <c658a> ../engine/textures.c:241 */
void TEX_AddAnimatingTextures(void) void TEX_AddAnimatingTextures(void)
{ {
char name[32]; char name[32];
@ -225,7 +214,6 @@ void TEX_AddAnimatingTextures(void)
if (miptex[i][0] != '+' && miptex[i][0] != '-') if (miptex[i][0] != '+' && miptex[i][0] != '-')
continue; continue;
Q_strncpy(name, miptex[i], 0x1Fu); Q_strncpy(name, miptex[i], 0x1Fu);
name[31] = 0; name[31] = 0;
@ -247,7 +235,6 @@ void TEX_AddAnimatingTextures(void)
} }
} }
if (nummiptex != base) if (nummiptex != base)
Con_DPrintf("added %i texture frames\n", nummiptex - base); Con_DPrintf("added %i texture frames\n", nummiptex - base);
} }

28
rehlds/engine/tmessage.cpp
View File

@ -62,7 +62,7 @@ client_textmessage_t gNetworkTextMessage[MAX_NETMESSAGE] =
gNetworkTextMessageBuffer[0] // pMessage gNetworkTextMessageBuffer[0] // pMessage
}; };
#else //HOOK_ENGINE #else // HOOK_ENGINE
client_textmessage_t *gMessageTable; client_textmessage_t *gMessageTable;
int gMessageTableCount; int gMessageTableCount;
@ -70,9 +70,8 @@ int gMessageTableCount;
const char *gNetworkMessageNames[MAX_NETMESSAGE]; const char *gNetworkMessageNames[MAX_NETMESSAGE];
client_textmessage_t gNetworkTextMessage[MAX_NETMESSAGE]; client_textmessage_t gNetworkTextMessage[MAX_NETMESSAGE];
#endif //HOOK_ENGINE #endif // HOOK_ENGINE
/* <c5144> ../engine/tmessage.c:47 */
char* EXT_FUNC memfgets(unsigned char *pMemFile, int fileSize, int *pFilePos, char *pBuffer, int bufferSize) char* EXT_FUNC memfgets(unsigned char *pMemFile, int fileSize, int *pFilePos, char *pBuffer, int bufferSize)
{ {
int filePos; int filePos;
@ -114,7 +113,6 @@ char* EXT_FUNC memfgets(unsigned char *pMemFile, int fileSize, int *pFilePos, ch
return pBuffer; return pBuffer;
} }
/* <c5236> ../engine/tmessage.c:99 */
int IsComment(char *pText) int IsComment(char *pText)
{ {
int length; int length;
@ -132,25 +130,21 @@ int IsComment(char *pText)
return FALSE; return FALSE;
} }
/* <c5108> ../engine/tmessage.c:118 */
int IsStartOfText(char *pText) int IsStartOfText(char *pText)
{ {
return pText && pText[0] == '{'; return pText && pText[0] == '{';
} }
/* <c5126> ../engine/tmessage.c:130 */
int IsEndOfText(char *pText) int IsEndOfText(char *pText)
{ {
return pText && pText[0] == '}'; return pText && pText[0] == '}';
} }
/* <c50c1> ../engine/tmessage.c:141 */
int IsWhiteSpace(char space) int IsWhiteSpace(char space)
{ {
return space == ' ' || space == '\t' || space == '\r' || space == '\n'; return space == ' ' || space == '\t' || space == '\r' || space == '\n';
} }
/* <c52fe> ../engine/tmessage.c:149 */
NOXREF const char *SkipSpace(const char *pText) NOXREF const char *SkipSpace(const char *pText)
{ {
if (pText) if (pText)
@ -164,7 +158,6 @@ NOXREF const char *SkipSpace(const char *pText)
return NULL; return NULL;
} }
/* <c5372> ../engine/tmessage.c:163 */
NOXREF const char *SkipText(const char *pText) NOXREF const char *SkipText(const char *pText)
{ {
if (pText) if (pText)
@ -177,7 +170,6 @@ NOXREF const char *SkipText(const char *pText)
return NULL; return NULL;
} }
/* <c5400> ../engine/tmessage.c:177 */
NOXREF int ParseFloats(const char *pText, float *pFloat, int count) NOXREF int ParseFloats(const char *pText, float *pFloat, int count)
{ {
const char *pTemp = pText; const char *pTemp = pText;
@ -201,7 +193,6 @@ NOXREF int ParseFloats(const char *pText, float *pFloat, int count)
return 0; return 0;
} }
/* <c5506> ../engine/tmessage.c:205 */
void TrimSpace(const char *source, char *dest) void TrimSpace(const char *source, char *dest)
{ {
int start, end, length; int start, end, length;
@ -233,7 +224,6 @@ void TrimSpace(const char *source, char *dest)
} }
} }
/* <c50df> ../engine/tmessage.c:232 */
NOXREF int IsToken(const char *pText, const char *pTokenName) NOXREF int IsToken(const char *pText, const char *pTokenName)
{ {
if (!pText || !pTokenName) if (!pText || !pTokenName)
@ -241,11 +231,10 @@ NOXREF int IsToken(const char *pText, const char *pTokenName)
if (!Q_strnicmp(pText + 1, pTokenName, Q_strlen(pTokenName))) if (!Q_strnicmp(pText + 1, pTokenName, Q_strlen(pTokenName)))
return 1; return 1;
return 0; return 0;
} }
/* <c55e5> ../engine/tmessage.c:245 */
NOXREF int ParseDirective(const char *pText) NOXREF int ParseDirective(const char *pText)
{ {
if (pText && pText[0] == '$') if (pText && pText[0] == '$')
@ -321,7 +310,6 @@ NOXREF int ParseDirective(const char *pText)
return 0; return 0;
} }
/* <c584f> ../engine/tmessage.c:324 */
NOXREF void TextMessageParse(unsigned char *pMemFile, int fileSize) NOXREF void TextMessageParse(unsigned char *pMemFile, int fileSize)
{ {
char buf[512]; char buf[512];
@ -362,7 +350,7 @@ NOXREF void TextMessageParse(unsigned char *pMemFile, int fileSize)
{ {
if (IsComment(trim)) if (IsComment(trim))
break; break;
if (ParseDirective(trim)) if (ParseDirective(trim))
break; break;
@ -429,9 +417,9 @@ NOXREF void TextMessageParse(unsigned char *pMemFile, int fileSize)
messageSize = (messageCount * sizeof(client_textmessage_t)); messageSize = (messageCount * sizeof(client_textmessage_t));
gMessageTable = (client_textmessage_t *)Mem_Malloc(textHeapSize + nameHeapSize + messageSize); gMessageTable = (client_textmessage_t *)Mem_Malloc(textHeapSize + nameHeapSize + messageSize);
Q_memcpy(gMessageTable, textMessages, messageSize); Q_memcpy(gMessageTable, textMessages, messageSize);
pNameHeap = ((char *)gMessageTable) + messageSize; pNameHeap = ((char *)gMessageTable) + messageSize;
Q_memcpy(pNameHeap, nameHeap, nameHeapSize); Q_memcpy(pNameHeap, nameHeap, nameHeapSize);
nameOffset = pNameHeap - gMessageTable[0].pName; nameOffset = pNameHeap - gMessageTable[0].pName;
@ -448,7 +436,6 @@ NOXREF void TextMessageParse(unsigned char *pMemFile, int fileSize)
gMessageTableCount = messageCount; gMessageTableCount = messageCount;
} }
/* <c5b18> ../engine/tmessage.c:454 */
NOXREF void TextMessageShutdown(void) NOXREF void TextMessageShutdown(void)
{ {
if (gMessageTable) if (gMessageTable)
@ -458,7 +445,6 @@ NOXREF void TextMessageShutdown(void)
} }
} }
/* <c5b2e> ../engine/tmessage.c:464 */
NOXREF void TextMessageInit(void) NOXREF void TextMessageInit(void)
{ {
int fileSize; int fileSize;
@ -476,7 +462,6 @@ NOXREF void TextMessageInit(void)
TextMessageParse(pMemFile, fileSize); TextMessageParse(pMemFile, fileSize);
} }
/* <c5b68> ../engine/tmessage.c:497 */
NOXREF client_textmessage_t *TextMessageGet(const char *pName) NOXREF client_textmessage_t *TextMessageGet(const char *pName)
{ {
int i; int i;
@ -506,5 +491,6 @@ NOXREF client_textmessage_t *TextMessageGet(const char *pName)
if (!Q_strcmp(pName, gMessageTable[i].pName)) if (!Q_strcmp(pName, gMessageTable[i].pName))
return &gMessageTable[i]; return &gMessageTable[i];
} }
return NULL; return NULL;
} }

6
rehlds/engine/traceinit.cpp
View File

@ -30,7 +30,6 @@
CInitTracker g_InitTracker; CInitTracker g_InitTracker;
/* <d7ebd> ../engine/traceinit.cpp:56 */
CInitTracker::CInitTracker(void) CInitTracker::CInitTracker(void)
{ {
for (int l = 0; l < NUM_LISTS; l++) for (int l = 0; l < NUM_LISTS; l++)
@ -40,7 +39,6 @@ CInitTracker::CInitTracker(void)
} }
} }
/* <d7d90> ../engine/traceinit.cpp:67 */
CInitTracker::~CInitTracker(void) CInitTracker::~CInitTracker(void)
{ {
for (int l = 0; l < NUM_LISTS; l++) for (int l = 0; l < NUM_LISTS; l++)
@ -59,7 +57,6 @@ CInitTracker::~CInitTracker(void)
} }
} }
/* <d7d31> ../engine/traceinit.cpp:91 */
void CInitTracker::Init(const char *init, const char *shutdown, int listnum) void CInitTracker::Init(const char *init, const char *shutdown, int listnum)
{ {
InitFunc *f = new InitFunc; InitFunc *f = new InitFunc;
@ -76,7 +73,6 @@ void CInitTracker::Init(const char *init, const char *shutdown, int listnum)
m_nNumFuncs[listnum]++; m_nNumFuncs[listnum]++;
} }
/* <d7ca7> ../engine/traceinit.cpp:111 */
void CInitTracker::Shutdown(const char *shutdown, int listnum) void CInitTracker::Shutdown(const char *shutdown, int listnum)
{ {
int i = 0; int i = 0;
@ -110,13 +106,11 @@ void CInitTracker::Shutdown(const char *shutdown, int listnum)
Sys_Printf("Shutdown function %s not in list!!!\n", shutdown); Sys_Printf("Shutdown function %s not in list!!!\n", shutdown);
} }
/* <d822d> ../engine/traceinit.cpp:158 */
void TraceInit(const char *i, const char *s, int listnum) void TraceInit(const char *i, const char *s, int listnum)
{ {
g_InitTracker.Init(i, s, listnum); g_InitTracker.Init(i, s, listnum);
} }
/* <d7fe7> ../engine/traceinit.cpp:167 */
void TraceShutdown(const char *s, int listnum) void TraceShutdown(const char *s, int listnum)
{ {
g_InitTracker.Shutdown(s, listnum); g_InitTracker.Shutdown(s, listnum);

1
rehlds/engine/traceinit.h
View File

@ -39,7 +39,6 @@
#define CInitTracker_destruct ~CInitTracker #define CInitTracker_destruct ~CInitTracker
#endif #endif
/* <d7004> ../engine/traceinit.cpp:16 */
class CInitTracker class CInitTracker
{ {
public: public:

27
rehlds/engine/unicode_strtools.cpp
View File

@ -288,7 +288,6 @@ static const uint32_t g_isPrintTable[2048] = {
0x8FFFF7EE, 0xBFFFFFFF, 0xAFFFFFFE, 0xFFFFFFFF, 0xFFFFFFFF, 0x7FFFFFFF, 0x1CFCFCFC, 0x00000000 0x8FFFF7EE, 0xBFFFFFFF, 0xAFFFFFFE, 0xFFFFFFFF, 0xFFFFFFFF, 0x7FFFFFFF, 0x1CFCFCFC, 0x00000000
}; };
/* <f2fc1> ../engine/unicode_strtools.cpp:23 */
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// Purpose: determine if a uchar32 represents a valid Unicode code point // Purpose: determine if a uchar32 represents a valid Unicode code point
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
@ -299,7 +298,6 @@ qboolean Q_IsValidUChar32(uchar32 uVal)
return (uVal < 0x110000u) && ((uVal - 0x00D800u) > 0x7FFu) && ((uVal & 0xFFFFu) < 0xFFFEu) && ((uVal - 0x00FDD0u) > 0x1Fu); return (uVal < 0x110000u) && ((uVal - 0x00D800u) > 0x7FFu) && ((uVal & 0xFFFFu) < 0xFFFEu) && ((uVal - 0x00FDD0u) > 0x1Fu);
} }
/* <f4251> ../engine/unicode_strtools.cpp:346 */
// Decode one character from a UTF-8 encoded string. Treats 6-byte CESU-8 sequences // Decode one character from a UTF-8 encoded string. Treats 6-byte CESU-8 sequences
// as a single character, as if they were a correctly-encoded 4-byte UTF-8 sequence. // as a single character, as if they were a correctly-encoded 4-byte UTF-8 sequence.
int Q_UTF8ToUChar32(const char *pUTF8_, uchar32 &uValueOut, bool &bErrorOut) int Q_UTF8ToUChar32(const char *pUTF8_, uchar32 &uValueOut, bool &bErrorOut)
@ -410,7 +408,7 @@ int __cdecl Q_IsUnprintableW(uchar16 c)
// behavior when used in names, web pages, chat windows, etc. // behavior when used in names, web pages, chat windows, etc.
// //
// characters in this set are removed from the beginning and/or end of strings // characters in this set are removed from the beginning and/or end of strings
// by Q_AggressiveStripPrecedingAndTrailingWhitespaceW() // by Q_AggressiveStripPrecedingAndTrailingWhitespaceW()
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
bool Q_IsMeanSpaceW(uchar16 wch) bool Q_IsMeanSpaceW(uchar16 wch)
{ {
@ -502,13 +500,12 @@ uchar16 *__cdecl StripUnprintableWorker(uchar16 *pwch, bool *pStripped)
} }
++rPos; ++rPos;
} }
*wPos = 0; *wPos = 0;
*pStripped = rPos != wPos; *pStripped = rPos != wPos;
return pwch; return pwch;
} }
/* <f45fd> ../engine/unicode_strtools.cpp:423 */
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// Purpose: Returns false if UTF-8 string contains invalid sequences. // Purpose: Returns false if UTF-8 string contains invalid sequences.
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
@ -528,7 +525,6 @@ qboolean Q_UnicodeValidate(const char *pUTF8)
return true; return true;
} }
/* <f46d1> ../engine/unicode_strtools.cpp:459 */
char *Q_UnicodeAdvance(char *pUTF8, int nChars) char *Q_UnicodeAdvance(char *pUTF8, int nChars)
{ {
uchar32 uVal = 0; uchar32 uVal = 0;
@ -543,7 +539,6 @@ char *Q_UnicodeAdvance(char *pUTF8, int nChars)
return pUTF8; return pUTF8;
} }
/* <f4a0d> ../engine/unicode_strtools.cpp:717 */
qboolean V_UTF8ToUChar32(const char *pUTF8_, uchar32 *uValueOut) qboolean V_UTF8ToUChar32(const char *pUTF8_, uchar32 *uValueOut)
{ {
bool bError = false; bool bError = false;
@ -551,7 +546,6 @@ qboolean V_UTF8ToUChar32(const char *pUTF8_, uchar32 *uValueOut)
return bError; return bError;
} }
/* <f2fe5> ../engine/unicode_strtools.cpp:137 */
int Q_UChar32ToUTF8Len(uchar32 uVal) { int Q_UChar32ToUTF8Len(uchar32 uVal) {
if (uVal <= 0x7F) if (uVal <= 0x7F)
return 1; return 1;
@ -562,13 +556,12 @@ int Q_UChar32ToUTF8Len(uchar32 uVal) {
return 2; return 2;
} }
/* <f3192> ../engine/unicode_strtools.cpp:180 */
int Q_UChar32ToUTF8(uchar32 uVal, char * pUTF8Out) { int Q_UChar32ToUTF8(uchar32 uVal, char * pUTF8Out) {
if (uVal <= 0x7F) if (uVal <= 0x7F)
{ {
*pUTF8Out = uVal; *pUTF8Out = uVal;
return 1; return 1;
} }
else if (uVal <= 0x7FF) else if (uVal <= 0x7FF)
{ {
*pUTF8Out = (uVal >> 6) | 0xC0; *pUTF8Out = (uVal >> 6) | 0xC0;
@ -614,7 +607,7 @@ int __cdecl Q_UChar32ToUTF16(uchar32 uVal, uchar16 *pUTF16Out)
} }
template< template<
typename T_IN, typename T_IN,
typename T_OUT, typename T_OUT,
bool UNK, bool UNK,
qboolean(*IN_TO_UCHAR32)(const T_IN *pUTF8, uchar32 &uValueOut, bool &bErrorOut), qboolean(*IN_TO_UCHAR32)(const T_IN *pUTF8, uchar32 &uValueOut, bool &bErrorOut),
@ -651,10 +644,10 @@ int Q_UnicodeConvertT(const T_IN* pIn, T_OUT *pOut, int nOutBytes, enum EStringC
pOut[0] = 0; pOut[0] = 0;
return 0; return 0;
} }
} }
}; };
pOut[nOut] = 0; pOut[nOut] = 0;
} }
else else
@ -670,7 +663,7 @@ int Q_UnicodeConvertT(const T_IN* pIn, T_OUT *pOut, int nOutBytes, enum EStringC
if (ePolicy & STRINGCONVERT_SKIP) if (ePolicy & STRINGCONVERT_SKIP)
{ {
nOut -= nOutElems; nOut -= nOutElems;
} }
else if (ePolicy & STRINGCONVERT_FAIL) else if (ePolicy & STRINGCONVERT_FAIL)
{ {
#ifndef REHLDS_FIXES #ifndef REHLDS_FIXES
@ -679,10 +672,11 @@ int Q_UnicodeConvertT(const T_IN* pIn, T_OUT *pOut, int nOutBytes, enum EStringC
#endif // REHLDS_FIXES #endif // REHLDS_FIXES
return 0; return 0;
} }
} }
} }
} }
return (nOut + 1) * sizeof(T_OUT); return (nOut + 1) * sizeof(T_OUT);
} }
@ -716,7 +710,6 @@ int __cdecl Q_UTF16ToUChar32(const uchar16 *pUTF16, uchar32 &uValueOut, bool &bE
} }
} }
/* <f4468> ../engine/unicode_strtools.cpp:246 */
int Q_UTF8ToUTF16(const char *pUTF8, uchar16 *pUTF16, int cubDestSizeInBytes, enum EStringConvertErrorPolicy ePolicy) int Q_UTF8ToUTF16(const char *pUTF8, uchar16 *pUTF16, int cubDestSizeInBytes, enum EStringConvertErrorPolicy ePolicy)
{ {
return Q_UnicodeConvertT<char, uchar16, true, Q_UTF8ToUChar32, Q_UChar32ToUTF16Len, Q_UChar32ToUTF16>(pUTF8, pUTF16, cubDestSizeInBytes, ePolicy); return Q_UnicodeConvertT<char, uchar16, true, Q_UTF8ToUChar32, Q_UChar32ToUTF16Len, Q_UChar32ToUTF16>(pUTF8, pUTF16, cubDestSizeInBytes, ePolicy);
@ -727,13 +720,11 @@ int Q_UTF16ToUTF8(const uchar16 *pUTF16, char *pUTF8, int cubDestSizeInBytes, en
return Q_UnicodeConvertT<uchar16, char, true, Q_UTF16ToUChar32, Q_UChar32ToUTF8Len, Q_UChar32ToUTF8>(pUTF16, pUTF8, cubDestSizeInBytes, ePolicy); return Q_UnicodeConvertT<uchar16, char, true, Q_UTF16ToUChar32, Q_UChar32ToUTF8Len, Q_UChar32ToUTF8>(pUTF16, pUTF8, cubDestSizeInBytes, ePolicy);
} }
/* <f4a63> ../engine/unicode_strtools.cpp:724 */
int Q_UnicodeRepair(char *pUTF8) int Q_UnicodeRepair(char *pUTF8)
{ {
return Q_UnicodeConvertT<char, char, true, Q_UTF8ToUChar32, Q_UChar32ToUTF8Len, Q_UChar32ToUTF8>(pUTF8, pUTF8, 65535, STRINGCONVERT_SKIP); return Q_UnicodeConvertT<char, char, true, Q_UTF8ToUChar32, Q_UChar32ToUTF8Len, Q_UChar32ToUTF8>(pUTF8, pUTF8, 65535, STRINGCONVERT_SKIP);
} }
/* <f4800> ../engine/unicode_strtools.cpp:691 */
qboolean Q_StripUnprintableAndSpace(char *pch) qboolean Q_StripUnprintableAndSpace(char *pch)
{ {
bool bStrippedAny; bool bStrippedAny;

2
rehlds/engine/usermsg.h
View File

@ -35,8 +35,6 @@
#include "maintypes.h" #include "maintypes.h"
#include "quakedef.h" #include "quakedef.h"
/* <3d23a> ../engine/usermsg.h:17 */
typedef struct _UserMsg typedef struct _UserMsg
{ {
int iMsg; int iMsg;

64
rehlds/engine/vid_null.cpp
View File

@ -38,64 +38,33 @@ float scr_con_current;
int r_pixbytes = 1; int r_pixbytes = 1;
cvar_t gl_vsync = { "gl_vsync", "1", 0, 0.0f, NULL }; cvar_t gl_vsync = { "gl_vsync", "1", 0, 0.0f, NULL };
#else //HOOK_ENGINE #else // HOOK_ENGINE
int r_pixbytes; int r_pixbytes;
cvar_t gl_vsync; cvar_t gl_vsync;
#endif //HOOK_ENGINE #endif // HOOK_ENGINE
/* <d6867> ../engine/vid_null.c:28 */
void VID_SetPalette(unsigned char *palette) { } void VID_SetPalette(unsigned char *palette) { }
/* <d6894> ../engine/vid_null.c:29 */
void VID_ShiftPalette(unsigned char *palette) { } void VID_ShiftPalette(unsigned char *palette) { }
/* <d68bb> ../engine/vid_null.c:30 */
void VID_WriteBuffer(const char *pFilename) { } void VID_WriteBuffer(const char *pFilename) { }
int VID_Init(unsigned short *palette) { return 1; }
/* <d68e2> ../engine/vid_null.c:32 */ void D_FlushCaches() { }
int VID_Init(short unsigned int *palette) { return 1; } void R_SetStackBase() { }
void SCR_UpdateScreen() { }
/* <d690d> ../engine/vid_null.c:51 */ void V_Init() { }
void D_FlushCaches(void) { } void Draw_Init() { }
void SCR_Init() { }
/* <d6921> ../engine/vid_null.c:52 */ void R_Init() { }
void R_SetStackBase(void) { }
/* <d6935> ../engine/vid_null.c:53 */
void SCR_UpdateScreen(void) { }
/* <d6949> ../engine/vid_null.c:54 */
void V_Init(void) { }
/* <d695d> ../engine/vid_null.c:56 */
void Draw_Init(void) { }
/* <d6971> ../engine/vid_null.c:57 */
void SCR_Init(void) { }
/* <d6985> ../engine/vid_null.c:58 */
void R_Init(void) { }
void R_ForceCVars(qboolean multiplayer) { } void R_ForceCVars(qboolean multiplayer) { }
/* <d6999> ../engine/vid_null.c:59 */
void SCR_BeginLoadingPlaque(qboolean reconnect) { } void SCR_BeginLoadingPlaque(qboolean reconnect) { }
void SCR_EndLoadingPlaque() { }
/* <d69c0> ../engine/vid_null.c:60 */ void R_InitSky() { }
void SCR_EndLoadingPlaque(void) { } void R_MarkLeaves()
/* <d69d4> ../engine/vid_null.c:62 */
void R_InitSky(void) { }
/* <d69e8> ../engine/vid_null.c:63 */
void R_MarkLeaves(void)
{ {
} }
/* <d69fc> ../engine/vid_null.c:78 */ void R_InitTextures()
void R_InitTextures(void)
{ {
r_notexture_mip = (texture_t *)Hunk_AllocName(404, "notexture"); r_notexture_mip = (texture_t *)Hunk_AllocName(404, "notexture");
r_notexture_mip->height = 16; r_notexture_mip->height = 16;
@ -125,11 +94,6 @@ void R_InitTextures(void)
} }
/* <d6a48> ../engine/vid_null.c:110 */
void StartLoadingProgressBar(const char *loadingType, int numProgressPoints) { } void StartLoadingProgressBar(const char *loadingType, int numProgressPoints) { }
/* <d6a7d> ../engine/vid_null.c:114 */
void ContinueLoadingProgressBar(const char *loadingType, int progressPoint, float progressFraction) { } void ContinueLoadingProgressBar(const char *loadingType, int progressPoint, float progressFraction) { }
/* <d6ac0> ../engine/vid_null.c:118 */
void SetLoadingProgressBarStatusText(const char *statusText) { } void SetLoadingProgressBarStatusText(const char *statusText) { }

2
rehlds/engine/vid_null.h
View File

@ -43,7 +43,7 @@ extern float scr_con_current;
void VID_SetPalette(unsigned char *palette); void VID_SetPalette(unsigned char *palette);
void VID_ShiftPalette(unsigned char *palette); void VID_ShiftPalette(unsigned char *palette);
void VID_WriteBuffer(const char *pFilename); void VID_WriteBuffer(const char *pFilename);
NOBODY int VID_Init(short unsigned int *palette); NOBODY int VID_Init(unsigned short *palette);
void D_FlushCaches(void); void D_FlushCaches(void);
void R_SetStackBase(void); void R_SetStackBase(void);
void SCR_UpdateScreen(void); void SCR_UpdateScreen(void);

7
rehlds/engine/wad.cpp
View File

@ -30,7 +30,6 @@
wadlist_t wads[NUM_WADS]; wadlist_t wads[NUM_WADS];
/* <c6c98> ../engine/wad.c:35 */
void W_CleanupName(char *in, char *out) void W_CleanupName(char *in, char *out)
{ {
int i; int i;
@ -49,7 +48,6 @@ void W_CleanupName(char *in, char *out)
Q_memset(&out[i], 0, 16 - i); Q_memset(&out[i], 0, 16 - i);
} }
/* <c6d06> ../engine/wad.c:62 */
int W_LoadWadFile(char *filename) int W_LoadWadFile(char *filename)
{ {
int slot = 0; int slot = 0;
@ -99,7 +97,6 @@ int W_LoadWadFile(char *filename)
return slot; return slot;
} }
/* <c6c45> ../engine/wad.c:132 */
lumpinfo_t *W_GetLumpinfo(int wad, char *name, qboolean doerror) lumpinfo_t *W_GetLumpinfo(int wad, char *name, qboolean doerror)
{ {
int i; int i;
@ -120,7 +117,6 @@ lumpinfo_t *W_GetLumpinfo(int wad, char *name, qboolean doerror)
return NULL; return NULL;
} }
/* <c6e6e> ../engine/wad.c:152 */
void *W_GetLumpName(int wad, char *name) void *W_GetLumpName(int wad, char *name)
{ {
lumpinfo_t *lump = W_GetLumpinfo(wad, name, TRUE); lumpinfo_t *lump = W_GetLumpinfo(wad, name, TRUE);
@ -129,7 +125,6 @@ void *W_GetLumpName(int wad, char *name)
return NULL; return NULL;
} }
/* <c6f2d> ../engine/wad.c:161 */
NOXREF void *W_GetLumpNum(int wad, int num) NOXREF void *W_GetLumpNum(int wad, int num)
{ {
lumpinfo_t *lump; lumpinfo_t *lump;
@ -140,7 +135,6 @@ NOXREF void *W_GetLumpNum(int wad, int num)
return (void *)&wads[wad].wad_base[lump->filepos]; return (void *)&wads[wad].wad_base[lump->filepos];
} }
/* <c6f87> ../engine/wad.c:173 */
void W_Shutdown(void) void W_Shutdown(void)
{ {
for (int slot = 0; slot < NUM_WADS; slot++) for (int slot = 0; slot < NUM_WADS; slot++)
@ -153,7 +147,6 @@ void W_Shutdown(void)
} }
} }
/* <c6c25> ../engine/wad.c:196 */
void SwapPic(qpic_t *pic) void SwapPic(qpic_t *pic)
{ {
pic->width = LittleLong(pic->width); pic->width = LittleLong(pic->width);

7
rehlds/engine/wad.h
View File

@ -34,8 +34,6 @@
#include "maintypes.h" #include "maintypes.h"
/* <c6abd> ../engine/wad.h:21 */
typedef struct qpic_s typedef struct qpic_s
{ {
int width; int width;
@ -43,7 +41,6 @@ typedef struct qpic_s
byte data[4]; byte data[4];
} qpic_t; } qpic_t;
/* <c6aff> ../engine/wad.h:27 */
typedef struct wadinfo_s typedef struct wadinfo_s
{ {
char identification[4]; char identification[4];
@ -51,7 +48,6 @@ typedef struct wadinfo_s
int infotableofs; int infotableofs;
} wadinfo_t; } wadinfo_t;
/* <c6b3d> ../engine/wad.h:34 */
typedef struct lumpinfo_s typedef struct lumpinfo_s
{ {
int filepos; int filepos;
@ -64,7 +60,6 @@ typedef struct lumpinfo_s
char name[16]; char name[16];
} lumpinfo_t; } lumpinfo_t;
/* <c6bc5> ../engine/wad.c:9 */
typedef struct wadlist_s typedef struct wadlist_s
{ {
qboolean loaded; qboolean loaded;
@ -75,8 +70,6 @@ typedef struct wadlist_s
} wadlist_t; } wadlist_t;
typedef struct wadlist_s wadlist_t; typedef struct wadlist_s wadlist_t;
/* <c6118> ../engine/wad.h:43 */
typedef struct lumpinfo_s lumpinfo_t; typedef struct lumpinfo_s lumpinfo_t;
#define NUM_WADS 2 #define NUM_WADS 2

43
rehlds/engine/world.cpp
View File

@ -38,21 +38,18 @@ int sv_numareanodes;
cvar_t sv_force_ent_intersection = { "sv_force_ent_intersection", "0", 0, 0.0f, NULL }; cvar_t sv_force_ent_intersection = { "sv_force_ent_intersection", "0", 0, 0.0f, NULL };
/* <ca50b> ../engine/world.c:48 */
void ClearLink(link_t *l) void ClearLink(link_t *l)
{ {
l->next = l; l->next = l;
l->prev = l; l->prev = l;
} }
/* <ca41e> ../engine/world.c:53 */
void RemoveLink(link_t *l) void RemoveLink(link_t *l)
{ {
l->next->prev = l->prev; l->next->prev = l->prev;
l->prev->next = l->next; l->prev->next = l->next;
} }
/* <ca452> ../engine/world.c:59 */
void InsertLinkBefore(link_t *l, link_t *before) void InsertLinkBefore(link_t *l, link_t *before)
{ {
l->next = before; l->next = before;
@ -61,7 +58,6 @@ void InsertLinkBefore(link_t *l, link_t *before)
l->prev->next = l; l->prev->next = l;
} }
/* <ca56a> ../engine/world.c:66 */
NOXREF void InsertLinkAfter(link_t *l, link_t *after) NOXREF void InsertLinkAfter(link_t *l, link_t *after)
{ {
l->prev = after; l->prev = after;
@ -71,7 +67,6 @@ NOXREF void InsertLinkAfter(link_t *l, link_t *after)
l->next->prev = l; l->next->prev = l;
} }
/* <ca59d> ../engine/world.c:94 */
void SV_InitBoxHull(void) void SV_InitBoxHull(void)
{ {
box_hull.clipnodes = &box_clipnodes[0]; box_hull.clipnodes = &box_clipnodes[0];
@ -93,7 +88,6 @@ void SV_InitBoxHull(void)
} }
} }
/* <ca3c6> ../engine/world.c:135 */
hull_t *SV_HullForBox(const vec_t *mins, const vec_t *maxs) hull_t *SV_HullForBox(const vec_t *mins, const vec_t *maxs)
{ {
box_planes[0].dist = maxs[0]; box_planes[0].dist = maxs[0];
@ -105,7 +99,6 @@ hull_t *SV_HullForBox(const vec_t *mins, const vec_t *maxs)
return &box_hull; return &box_hull;
} }
/* <ca60c> ../engine/world.c:148 */
NOXREF hull_t *SV_HullForBeam(const vec_t *start, const vec_t *end, const vec_t *size) NOXREF hull_t *SV_HullForBeam(const vec_t *start, const vec_t *end, const vec_t *size)
{ {
vec3_t tmp = { 0, 0, 0 }; vec3_t tmp = { 0, 0, 0 };
@ -162,7 +155,6 @@ NOXREF hull_t *SV_HullForBeam(const vec_t *start, const vec_t *end, const vec_t
return &beam_hull; return &beam_hull;
} }
/* <ca662> ../engine/world.c:201 */
struct hull_s *SV_HullForBsp(edict_t *ent, const vec_t *mins, const vec_t *maxs, vec_t *offset) struct hull_s *SV_HullForBsp(edict_t *ent, const vec_t *mins, const vec_t *maxs, vec_t *offset)
{ {
model_t *model; model_t *model;
@ -192,14 +184,12 @@ struct hull_s *SV_HullForBsp(edict_t *ent, const vec_t *mins, const vec_t *maxs,
} }
// TODO: add cvar for this? // TODO: add cvar for this?
#ifdef REHLDS_FIXES #ifdef REHLDS_FIXES
if ( sv_rehlds_hull_centering.value if (sv_rehlds_hull_centering.value && mins[0] + maxs[0] == 0.0f)
&& mins[0] + maxs[0] == 0.0f)
offset[0] = 0.0f; offset[0] = 0.0f;
else else
offset[0] = hull->clip_mins[0] - mins[0]; offset[0] = hull->clip_mins[0] - mins[0];
if ( sv_rehlds_hull_centering.value if (sv_rehlds_hull_centering.value && mins[1] + maxs[1] == 0.0f)
&& mins[1] + maxs[1] == 0.0f)
offset[1] = 0.0f; offset[1] = 0.0f;
else else
offset[1] = hull->clip_mins[1] - mins[1]; offset[1] = hull->clip_mins[1] - mins[1];
@ -223,7 +213,6 @@ struct hull_s *SV_HullForBsp(edict_t *ent, const vec_t *mins, const vec_t *maxs,
return hull; return hull;
} }
/* <ca6f1> ../engine/world.c:251 */
hull_t *SV_HullForEntity(edict_t *ent, const vec_t *mins, const vec_t *maxs, vec_t *offset) hull_t *SV_HullForEntity(edict_t *ent, const vec_t *mins, const vec_t *maxs, vec_t *offset)
{ {
vec3_t hullmins; vec3_t hullmins;
@ -249,7 +238,6 @@ hull_t *SV_HullForEntity(edict_t *ent, const vec_t *mins, const vec_t *maxs, vec
return SV_HullForBox(hullmins, hullmaxs); return SV_HullForBox(hullmins, hullmaxs);
} }
/* <ca793> ../engine/world.c:308 */
areanode_t *SV_CreateAreaNode(int depth, vec_t *mins, vec_t *maxs) areanode_t *SV_CreateAreaNode(int depth, vec_t *mins, vec_t *maxs)
{ {
areanode_t *anode; areanode_t *anode;
@ -301,7 +289,6 @@ areanode_t *SV_CreateAreaNode(int depth, vec_t *mins, vec_t *maxs)
return anode; return anode;
} }
/* <ca877> ../engine/world.c:353 */
void SV_ClearWorld(void) void SV_ClearWorld(void)
{ {
SV_InitBoxHull(); SV_InitBoxHull();
@ -310,7 +297,6 @@ void SV_ClearWorld(void)
SV_CreateAreaNode(0, g_psv.worldmodel->mins, g_psv.worldmodel->maxs); SV_CreateAreaNode(0, g_psv.worldmodel->mins, g_psv.worldmodel->maxs);
} }
/* <ca8bb> ../engine/world.c:369 */
void SV_UnlinkEdict(edict_t *ent) void SV_UnlinkEdict(edict_t *ent)
{ {
if (ent->area.prev) if (ent->area.prev)
@ -321,7 +307,6 @@ void SV_UnlinkEdict(edict_t *ent)
} }
} }
/* <ca9f5> ../engine/world.c:383 */
void SV_TouchLinks(edict_t *ent, areanode_t *node) void SV_TouchLinks(edict_t *ent, areanode_t *node)
{ {
edict_t *touch; edict_t *touch;
@ -394,7 +379,6 @@ void SV_TouchLinks(edict_t *ent, areanode_t *node)
} }
} }
/* <ca8f2> ../engine/world.c:467 */
#ifndef REHLDS_OPT_PEDANTIC #ifndef REHLDS_OPT_PEDANTIC
void SV_FindTouchedLeafs(edict_t *ent, mnode_t *node, int *topnode) void SV_FindTouchedLeafs(edict_t *ent, mnode_t *node, int *topnode)
{ {
@ -538,7 +522,6 @@ void SV_FindTouchedLeafs(edict_t *ent, mnode_t *node, int *topnode)
} }
#endif // REHLDS_OPT_PEDANTIC #endif // REHLDS_OPT_PEDANTIC
/* <caab0> ../engine/world.c:517 */
void SV_LinkEdict(edict_t *ent, qboolean touch_triggers) void SV_LinkEdict(edict_t *ent, qboolean touch_triggers)
{ {
static int iTouchLinkSemaphore = 0; static int iTouchLinkSemaphore = 0;
@ -614,7 +597,6 @@ void SV_LinkEdict(edict_t *ent, qboolean touch_triggers)
} }
} }
/* <ca97c> ../engine/world.c:630 */
int SV_HullPointContents(hull_t *hull, int num, const vec_t *p) int SV_HullPointContents(hull_t *hull, int num, const vec_t *p)
{ {
dclipnode_t *node; dclipnode_t *node;
@ -638,7 +620,6 @@ int SV_HullPointContents(hull_t *hull, int num, const vec_t *p)
return i; return i;
} }
/* <cabb7> ../engine/world.c:663 */
int SV_LinkContents(areanode_t *node, const vec_t *pos) int SV_LinkContents(areanode_t *node, const vec_t *pos)
{ {
link_t *l; link_t *l;
@ -725,7 +706,6 @@ int SV_LinkContents(areanode_t *node, const vec_t *pos)
return -1; return -1;
} }
/* <cac70> ../engine/world.c:738 */
int SV_PointContents(const vec_t *p) int SV_PointContents(const vec_t *p)
{ {
int cont; int cont;
@ -746,7 +726,6 @@ int SV_PointContents(const vec_t *p)
return (entityContents != -1) ? entityContents : cont; return (entityContents != -1) ? entityContents : cont;
} }
/* <cb289> ../engine/world.c:764 */
edict_t *SV_TestEntityPosition(edict_t *ent) edict_t *SV_TestEntityPosition(edict_t *ent)
{ {
trace_t trace; trace_t trace;
@ -764,7 +743,6 @@ edict_t *SV_TestEntityPosition(edict_t *ent)
} }
#ifndef REHLDS_OPT_PEDANTIC #ifndef REHLDS_OPT_PEDANTIC
/* <cacbc> ../engine/world.c:804 */
qboolean SV_RecursiveHullCheck(hull_t *hull, int num, float p1f, float p2f, const vec_t *p1, const vec_t *p2, trace_t *trace) qboolean SV_RecursiveHullCheck(hull_t *hull, int num, float p1f, float p2f, const vec_t *p1, const vec_t *p2, trace_t *trace)
{ {
dclipnode_t *node; dclipnode_t *node;
@ -1056,7 +1034,6 @@ qboolean SV_RecursiveHullCheck(hull_t *hull, int num, float p1f, float p2f, cons
} }
#endif // REHLDS_OPT_PEDANTIC #endif // REHLDS_OPT_PEDANTIC
/* <cadd3> ../engine/world.c:948 */
void SV_SingleClipMoveToEntity(edict_t *ent, const vec_t *start, const vec_t *mins, const vec_t *maxs, const vec_t *end, trace_t *trace) void SV_SingleClipMoveToEntity(edict_t *ent, const vec_t *start, const vec_t *mins, const vec_t *maxs, const vec_t *end, trace_t *trace)
{ {
hull_t *hull; hull_t *hull;
@ -1102,7 +1079,7 @@ void SV_SingleClipMoveToEntity(edict_t *ent, const vec_t *start, const vec_t *mi
start_l[0] = _DotProduct(forward, temp); start_l[0] = _DotProduct(forward, temp);
start_l[1] = -_DotProduct(right, temp); start_l[1] = -_DotProduct(right, temp);
start_l[2] = _DotProduct(up, temp); start_l[2] = _DotProduct(up, temp);
temp[0] = end_l[0]; temp[1] = end_l[1]; temp[2] = end_l[2]; temp[0] = end_l[0]; temp[1] = end_l[1]; temp[2] = end_l[2];
end_l[0] = _DotProduct(forward, temp); end_l[0] = _DotProduct(forward, temp);
end_l[1] = -_DotProduct(right, temp); end_l[1] = -_DotProduct(right, temp);
@ -1172,7 +1149,6 @@ void SV_SingleClipMoveToEntity(edict_t *ent, const vec_t *start, const vec_t *mi
trace->ent = ent; trace->ent = ent;
} }
/* <caf84> ../engine/world.c:1082 */
trace_t SV_ClipMoveToEntity(edict_t *ent, const vec_t *start, const vec_t *mins, const vec_t *maxs, const vec_t *end) trace_t SV_ClipMoveToEntity(edict_t *ent, const vec_t *start, const vec_t *mins, const vec_t *maxs, const vec_t *end)
{ {
trace_t goodtrace; trace_t goodtrace;
@ -1181,7 +1157,6 @@ trace_t SV_ClipMoveToEntity(edict_t *ent, const vec_t *start, const vec_t *mins,
return goodtrace; return goodtrace;
} }
/* <cb027> ../engine/world.c:1148 */
void SV_ClipToLinks(areanode_t *node, moveclip_t *clip) void SV_ClipToLinks(areanode_t *node, moveclip_t *clip)
{ {
link_t *l; link_t *l;
@ -1281,7 +1256,6 @@ void SV_ClipToLinks(areanode_t *node, moveclip_t *clip)
} }
} }
/* <cb142> ../engine/world.c:1267 */
void SV_ClipToWorldbrush(areanode_t *node, moveclip_t *clip) void SV_ClipToWorldbrush(areanode_t *node, moveclip_t *clip)
{ {
link_t *l; link_t *l;
@ -1330,7 +1304,6 @@ void SV_ClipToWorldbrush(areanode_t *node, moveclip_t *clip)
} }
} }
/* <cb206> ../engine/world.c:1330 */
void SV_MoveBounds(const vec_t *start, const vec_t *mins, const vec_t *maxs, const vec_t *end, vec_t *boxmins, vec_t *boxmaxs) void SV_MoveBounds(const vec_t *start, const vec_t *mins, const vec_t *maxs, const vec_t *end, vec_t *boxmins, vec_t *boxmaxs)
{ {
for (int i = 0; i < 3; i++) for (int i = 0; i < 3; i++)
@ -1348,7 +1321,6 @@ void SV_MoveBounds(const vec_t *start, const vec_t *mins, const vec_t *maxs, con
} }
} }
/* <cb391> ../engine/world.c:1364 */
trace_t SV_MoveNoEnts(const vec_t *start, vec_t *mins, vec_t *maxs, const vec_t *end, int type, edict_t *passedict) trace_t SV_MoveNoEnts(const vec_t *start, vec_t *mins, vec_t *maxs, const vec_t *end, int type, edict_t *passedict)
{ {
moveclip_t clip; moveclip_t clip;
@ -1392,7 +1364,6 @@ trace_t SV_MoveNoEnts(const vec_t *start, vec_t *mins, vec_t *maxs, const vec_t
return clip.trace; return clip.trace;
} }
/* <cb47e> ../engine/world.c:1415 */
trace_t SV_Move(const vec_t *start, const vec_t *mins, const vec_t *maxs, const vec_t *end, int type, edict_t *passedict, qboolean monsterClipBrush) trace_t SV_Move(const vec_t *start, const vec_t *mins, const vec_t *maxs, const vec_t *end, int type, edict_t *passedict, qboolean monsterClipBrush)
{ {
moveclip_t clip; moveclip_t clip;
@ -1461,9 +1432,9 @@ void SV_SingleClipMoveToPoint(const vec_t *start, const vec_t *end, trace_t *tra
if (trace->fraction != 1.0f) if (trace->fraction != 1.0f)
{ {
trace->endpos[0] = ( end[0] - start[0] ) * trace->fraction + start[0]; trace->endpos[0] = (end[0] - start[0]) * trace->fraction + start[0];
trace->endpos[1] = ( end[1] - start[1] ) * trace->fraction + start[1]; trace->endpos[1] = (end[1] - start[1]) * trace->fraction + start[1];
trace->endpos[2] = ( end[2] - start[2] ) * trace->fraction + start[2]; trace->endpos[2] = (end[2] - start[2]) * trace->fraction + start[2];
} }
if (trace->fraction < 1.0f || trace->startsolid) if (trace->fraction < 1.0f || trace->startsolid)

11
rehlds/engine/world.h
View File

@ -35,8 +35,6 @@
#include "maintypes.h" #include "maintypes.h"
#include "model.h" #include "model.h"
/* <ca280> ../engine/world.h:15 */
typedef struct areanode_s typedef struct areanode_s
{ {
int axis; int axis;
@ -46,7 +44,6 @@ typedef struct areanode_s
link_t solid_edicts; link_t solid_edicts;
} areanode_t; } areanode_t;
/* <ca2fb> ../engine/world.c:20 */
typedef struct moveclip_s // TODO: Move it to world.cpp someday typedef struct moveclip_s // TODO: Move it to world.cpp someday
{ {
vec3_t boxmins; vec3_t boxmins;
@ -89,14 +86,6 @@ extern areanode_t sv_areanodes[32];
extern int sv_numareanodes; extern int sv_numareanodes;
extern cvar_t sv_force_ent_intersection; extern cvar_t sv_force_ent_intersection;
/*
hull_t box_hull;
hull_t beam_hull;
dclipnode_t box_clipnodes[6];
mplane_t box_planes[6];
mplane_t beam_planes[6];
*/
void ClearLink(link_t *l); void ClearLink(link_t *l);
void RemoveLink(link_t *l); void RemoveLink(link_t *l);

44
rehlds/engine/zone.cpp
View File

@ -72,15 +72,14 @@ typedef struct memzone_s
cvar_t mem_dbgfile = { "mem_dbgfile", ".\\mem.txt", 0, 0.0f, NULL }; cvar_t mem_dbgfile = { "mem_dbgfile", ".\\mem.txt", 0, 0.0f, NULL };
#else //HOOK_ENGINE #else // HOOK_ENGINE
cvar_t mem_dbgfile; cvar_t mem_dbgfile;
#endif //HOOK_ENGINE #endif // HOOK_ENGINE
memzone_t *mainzone; memzone_t *mainzone;
/* <cd94b> ../engine/zone.c:71 */
void Z_ClearZone(memzone_t *zone, int size) void Z_ClearZone(memzone_t *zone, int size)
{ {
memblock_t *block = (memblock_t *)&zone[1]; memblock_t *block = (memblock_t *)&zone[1];
@ -95,7 +94,6 @@ void Z_ClearZone(memzone_t *zone, int size)
block->size = size - sizeof(memzone_t); block->size = size - sizeof(memzone_t);
} }
/* <cdb66> ../engine/zone.c:96 */
void Z_Free(void *ptr) void Z_Free(void *ptr)
{ {
if (!ptr) if (!ptr)
@ -148,7 +146,6 @@ void Z_Free(void *ptr)
} }
} }
/* <cdbc6> ../engine/zone.c:139 */
void *Z_Malloc(int size) void *Z_Malloc(int size)
{ {
Z_CheckHeap(); Z_CheckHeap();
@ -164,7 +161,6 @@ void *Z_Malloc(int size)
return buf; return buf;
} }
/* <cd9bd> ../engine/zone.c:152 */
void *Z_TagMalloc(int size, int tag) void *Z_TagMalloc(int size, int tag)
{ {
int extra; int extra;
@ -224,7 +220,6 @@ void *Z_TagMalloc(int size, int tag)
return (void *)((byte *)base + sizeof(memblock_t)); return (void *)((byte *)base + sizeof(memblock_t));
} }
/* <cdcc9> ../engine/zone.c:216 */
NOXREF void Z_Print(memzone_t *zone) NOXREF void Z_Print(memzone_t *zone)
{ {
NOXREFCHECK; NOXREFCHECK;
@ -258,7 +253,6 @@ NOXREF void Z_Print(memzone_t *zone)
} }
} }
/* <cdbac> ../engine/zone.c:244 */
void Z_CheckHeap(void) void Z_CheckHeap(void)
{ {
memblock_t *block; memblock_t *block;
@ -318,7 +312,6 @@ Run consistency and sentinel trashing checks
============== ==============
*/ */
/* <cdd1f> ../engine/zone.c:291 */
void Hunk_Check(void) void Hunk_Check(void)
{ {
hunk_t *h; hunk_t *h;
@ -346,7 +339,6 @@ Otherwise, allocations with the same name will be totaled up before printing.
============== ==============
*/ */
/* <ce570> ../engine/zone.c:316 */
NOXREF void Hunk_Print(qboolean all) NOXREF void Hunk_Print(qboolean all)
{ {
NOXREFCHECK; NOXREFCHECK;
@ -433,7 +425,6 @@ Hunk_AllocName
=================== ===================
*/ */
/* <ce31c> ../engine/zone.c:413 */
void *Hunk_AllocName(int size, const char *name) void *Hunk_AllocName(int size, const char *name)
{ {
if (size < 0) if (size < 0)
@ -462,19 +453,16 @@ void *Hunk_AllocName(int size, const char *name)
return (void *)(h + 1); return (void *)(h + 1);
} }
/* <ce368> ../engine/zone.c:449 */
void *Hunk_Alloc(int size) void *Hunk_Alloc(int size)
{ {
return Hunk_AllocName(size, "unknown"); return Hunk_AllocName(size, "unknown");
} }
/* <cdd48> ../engine/zone.c:454 */
int Hunk_LowMark(void) int Hunk_LowMark(void)
{ {
return hunk_low_used; return hunk_low_used;
} }
/* <cdd61> ../engine/zone.c:459 */
void Hunk_FreeToLowMark(int mark) void Hunk_FreeToLowMark(int mark)
{ {
if (mark < 0 || mark > hunk_low_used) if (mark < 0 || mark > hunk_low_used)
@ -485,7 +473,6 @@ void Hunk_FreeToLowMark(int mark)
hunk_low_used = mark; hunk_low_used = mark;
} }
/* <cdddf> ../engine/zone.c:474 */
int Hunk_HighMark(void) int Hunk_HighMark(void)
{ {
if (hunk_tempactive) if (hunk_tempactive)
@ -497,7 +484,6 @@ int Hunk_HighMark(void)
return hunk_high_used; return hunk_high_used;
} }
/* <cdd8b> ../engine/zone.c:485 */
void Hunk_FreeToHighMark(int mark) void Hunk_FreeToHighMark(int mark)
{ {
if (hunk_tempactive) if (hunk_tempactive)
@ -520,7 +506,6 @@ Hunk_HighAllocName
=================== ===================
*/ */
/* <cd981> ../engine/zone.c:512 */
void *Hunk_HighAllocName(int size, const char *name) void *Hunk_HighAllocName(int size, const char *name)
{ {
hunk_t *h; hunk_t *h;
@ -565,7 +550,6 @@ Return space from the top of the hunk
================= =================
*/ */
/* <ce18a> ../engine/zone.c:559 */
void *Hunk_TempAlloc(int size) void *Hunk_TempAlloc(int size)
{ {
void *buf; void *buf;
@ -616,7 +600,6 @@ Cache_Move
=========== ===========
*/ */
/* <cdf27> ../engine/zone.c:607 */
void Cache_Move(cache_system_t *c) void Cache_Move(cache_system_t *c)
{ {
cache_system_t *newmem = Cache_TryAlloc(c->size, 1); cache_system_t *newmem = Cache_TryAlloc(c->size, 1);
@ -643,7 +626,6 @@ Throw things out until the hunk can be expanded to the given point
============ ============
*/ */
/* <ce231> ../engine/zone.c:638 */
void Cache_FreeLow(int new_low_hunk) void Cache_FreeLow(int new_low_hunk)
{ {
cache_system_t *c; cache_system_t *c;
@ -667,7 +649,6 @@ Throw things out until the hunk can be expanded to the given point
============ ============
*/ */
/* <cdffe> ../engine/zone.c:660 */
void Cache_FreeHigh(int new_high_hunk) void Cache_FreeHigh(int new_high_hunk)
{ {
cache_system_t *c, *prev; cache_system_t *c, *prev;
@ -690,7 +671,6 @@ void Cache_FreeHigh(int new_high_hunk)
} }
} }
/* <cdaae> ../engine/zone.c:682 */
void Cache_UnlinkLRU(cache_system_t *cs) void Cache_UnlinkLRU(cache_system_t *cs)
{ {
if (!cs->lru_next || !cs->lru_prev) if (!cs->lru_next || !cs->lru_prev)
@ -703,7 +683,6 @@ void Cache_UnlinkLRU(cache_system_t *cs)
cs->lru_next = cs->lru_prev = 0; cs->lru_next = cs->lru_prev = 0;
} }
/* <cde3c> ../engine/zone.c:693 */
void Cache_MakeLRU(cache_system_t *cs) void Cache_MakeLRU(cache_system_t *cs)
{ {
if (cs->lru_next || cs->lru_prev) if (cs->lru_next || cs->lru_prev)
@ -726,7 +705,6 @@ Size should already include the header and padding
============ ============
*/ */
/* <cde75> ../engine/zone.c:712 */
cache_system_t *Cache_TryAlloc(int size, qboolean nobottom) cache_system_t *Cache_TryAlloc(int size, qboolean nobottom)
{ {
cache_system_t *cs; cache_system_t *cs;
@ -799,7 +777,6 @@ Throw everything out, so new data will be demand cached
============ ============
*/ */
/* <cda7e> ../engine/zone.c:793 */
void Cache_Force_Flush(void) void Cache_Force_Flush(void)
{ {
cache_system_t *i; cache_system_t *i;
@ -810,7 +787,6 @@ void Cache_Force_Flush(void)
} }
} }
/* <cdac9> ../engine/zone.c:806 */
void Cache_Flush(void) void Cache_Flush(void)
{ {
if (g_pcl.maxclients <= 1 || allow_cheats) if (g_pcl.maxclients <= 1 || allow_cheats)
@ -832,7 +808,6 @@ Used with qsort()
============ ============
*/ */
/* <cda1d> ../engine/zone.c:827 */
NOXREF int CacheSystemCompare(const void *ppcs1, const void *ppcs2) NOXREF int CacheSystemCompare(const void *ppcs1, const void *ppcs2)
{ {
NOXREFCHECK; NOXREFCHECK;
@ -850,7 +825,6 @@ Cache_Print
============ ============
*/ */
/* <ce4e9> ../engine/zone.c:842 */
NOXREF void Cache_Print(void) NOXREF void Cache_Print(void)
{ {
NOXREFCHECK; NOXREFCHECK;
@ -872,7 +846,6 @@ compares the first directory of two paths...
============ ============
*/ */
/* <ce3ef> ../engine/zone.c:883 */
NOXREF int ComparePath1(char *path1, char *path2) NOXREF int ComparePath1(char *path1, char *path2)
{ {
NOXREFCHECK; NOXREFCHECK;
@ -898,7 +871,6 @@ appropriate places.
============ ============
*/ */
/* <ce443> ../engine/zone.c:906 */
NOXREF char *CommatizeNumber(int num, char *pout) NOXREF char *CommatizeNumber(int num, char *pout)
{ {
NOXREFCHECK; NOXREFCHECK;
@ -938,7 +910,6 @@ Cache_Report
============ ============
*/ */
/* <ce65e> ../engine/zone.c:946 */
NOXREF void Cache_Report(void) NOXREF void Cache_Report(void)
{ {
NOXREFCHECK; NOXREFCHECK;
@ -952,7 +923,6 @@ Cache_Compact
============ ============
*/ */
/* <ce674> ../engine/zone.c:957 */
NOXREF void Cache_Compact(void) NOXREF void Cache_Compact(void)
{ {
NOXREFCHECK; NOXREFCHECK;
@ -965,7 +935,6 @@ Cache_Init
============ ============
*/ */
/* <ce689> ../engine/zone.c:967 */
void Cache_Init(void) void Cache_Init(void)
{ {
cache_head.next = cache_head.prev = &cache_head; cache_head.next = cache_head.prev = &cache_head;
@ -982,7 +951,6 @@ Frees the memory and removes it from the LRU list
============== ==============
*/ */
/* <cda89> ../engine/zone.c:982 */
void Cache_Free(cache_user_t *c) void Cache_Free(cache_user_t *c)
{ {
if (!c->data) if (!c->data)
@ -999,7 +967,6 @@ void Cache_Free(cache_user_t *c)
Cache_UnlinkLRU(cs); Cache_UnlinkLRU(cs);
} }
/* <ce6e6> ../engine/zone.c:1000 */
NOXREF int Cache_TotalUsed(void) NOXREF int Cache_TotalUsed(void)
{ {
NOXREFCHECK; NOXREFCHECK;
@ -1018,7 +985,6 @@ Cache_Check
============== ==============
*/ */
/* <ce723> ../engine/zone.c:1018 */
void* EXT_FUNC Cache_Check(cache_user_t *c) void* EXT_FUNC Cache_Check(cache_user_t *c)
{ {
cache_system_t *cs; cache_system_t *cs;
@ -1040,7 +1006,6 @@ Cache_Alloc
============== ==============
*/ */
/* <ce7ab> ../engine/zone.c:1040 */
void *Cache_Alloc(cache_user_t *c, int size, char *name) void *Cache_Alloc(cache_user_t *c, int size, char *name)
{ {
cache_system_t *cs; cache_system_t *cs;
@ -1086,7 +1051,6 @@ Memory_Init
======================== ========================
*/ */
/* <ce8ad> ../engine/zone.c:1262 */
void Memory_Init(void *buf, int size) void Memory_Init(void *buf, int size)
{ {
int zonesize = ZONE_DYNAMIC_SIZE; int zonesize = ZONE_DYNAMIC_SIZE;
@ -1116,7 +1080,6 @@ void Memory_Init(void *buf, int size)
Z_ClearZone(mainzone, zonesize); Z_ClearZone(mainzone, zonesize);
} }
/* <ce944> ../engine/zone.c:1299 */
NOXREF void Cache_Print_Models_And_Totals(void) NOXREF void Cache_Print_Models_And_Totals(void)
{ {
char buf[50]; char buf[50];
@ -1143,7 +1106,7 @@ NOXREF void Cache_Print_Models_And_Totals(void)
qsort(sortarray, i, sizeof(cache_system_t *), CacheSystemCompare); qsort(sortarray, i, sizeof(cache_system_t *), CacheSystemCompare);
FS_FPrintf(file, "\nCACHED MODELS:\n"); FS_FPrintf(file, "\nCACHED MODELS:\n");
//now process the sorted list. //now process the sorted list.
for (j = 0; j < i; j++) for (j = 0; j < i; j++)
{ {
FS_FPrintf(file, "\t%16.16s : %s\n", CommatizeNumber(sortarray[j]->size, buf), sortarray[j]->name); FS_FPrintf(file, "\t%16.16s : %s\n", CommatizeNumber(sortarray[j]->size, buf), sortarray[j]->name);
@ -1156,7 +1119,6 @@ NOXREF void Cache_Print_Models_And_Totals(void)
#define MAX_SFX 1024 #define MAX_SFX 1024
/* <cea16> ../engine/zone.c:1367 */
NOXREF void Cache_Print_Sounds_And_Totals(void) NOXREF void Cache_Print_Sounds_And_Totals(void)
{ {
char buf[50]; char buf[50];

2
rehlds/public/engine_hlds_api.h
View File

@ -31,8 +31,6 @@
#include "maintypes.h" #include "maintypes.h"
#include "interface.h" #include "interface.h"
/* <8f5d0> ../public/engine_hlds_api.h:11 */
class IDedicatedServerAPI : public IBaseInterface class IDedicatedServerAPI : public IBaseInterface
{ {
public: public:

3
rehlds/public/engine_launcher_api.h
View File

@ -35,12 +35,9 @@
#include "maintypes.h" #include "maintypes.h"
#include "interface.h" #include "interface.h"
/* <8f7fd> ../public/engine_launcher_api.h:17 */
class IEngineAPI : public IBaseInterface class IEngineAPI : public IBaseInterface
{ {
public: public:
virtual int Run(void *instance, char *basedir, char *cmdline, char *postRestartCmdLineArgs, CreateInterfaceFn launcherFactory, CreateInterfaceFn filesystemFactory) = 0; virtual int Run(void *instance, char *basedir, char *cmdline, char *postRestartCmdLineArgs, CreateInterfaceFn launcherFactory, CreateInterfaceFn filesystemFactory) = 0;
}; };

12
rehlds/public/rehlds/bspfile.h
View File

@ -59,14 +59,12 @@
#define HEADER_LUMPS 15 #define HEADER_LUMPS 15
/* <a1fc> ../engine/bspfile.h:41 */
typedef struct lump_s typedef struct lump_s
{ {
int fileofs; int fileofs;
int filelen; int filelen;
} lump_t; } lump_t;
/* <a22c> ../engine/bspfile.h:64 */
typedef struct dmodel_s typedef struct dmodel_s
{ {
float mins[3], maxs[3]; float mins[3], maxs[3];
@ -76,21 +74,18 @@ typedef struct dmodel_s
int firstface, numfaces; int firstface, numfaces;
} dmodel_t; } dmodel_t;
/* <a2c2> ../engine/bspfile.h:73 */
typedef struct dheader_s typedef struct dheader_s
{ {
int version; int version;
lump_t lumps[15]; lump_t lumps[15];
} dheader_t; } dheader_t;
/* <485b2> ../engine/bspfile.h:79 */
typedef struct dmiptexlump_s typedef struct dmiptexlump_s
{ {
int _nummiptex; int _nummiptex;
int dataofs[4]; int dataofs[4];
} dmiptexlump_t; } dmiptexlump_t;
/* <1ce18> ../engine/bspfile.h:86 */
typedef struct miptex_s typedef struct miptex_s
{ {
char name[16]; char name[16];
@ -99,13 +94,11 @@ typedef struct miptex_s
unsigned offsets[4]; unsigned offsets[4];
} miptex_t; } miptex_t;
/* <48652> ../engine/bspfile.h:94 */
typedef struct dvertex_s typedef struct dvertex_s
{ {
float point[3]; float point[3];
} dvertex_t; } dvertex_t;
/* <48674> ../engine/bspfile.h:110 */
typedef struct dplane_s typedef struct dplane_s
{ {
float normal[3]; float normal[3];
@ -113,7 +106,6 @@ typedef struct dplane_s
int type; int type;
} dplane_t; } dplane_t;
/* <486b2> ../engine/bspfile.h:132 */
typedef struct dnode_s typedef struct dnode_s
{ {
int planenum; int planenum;
@ -124,14 +116,12 @@ typedef struct dnode_s
unsigned short numfaces; unsigned short numfaces;
} dnode_t; } dnode_t;
/* <a332> ../engine/bspfile.h:142 */
typedef struct dclipnode_s typedef struct dclipnode_s
{ {
int planenum; int planenum;
short children[2]; // negative numbers are contents short children[2]; // negative numbers are contents
} dclipnode_t; } dclipnode_t;
/* <4876a> ../engine/bspfile.h:149 */
typedef struct texinfo_s typedef struct texinfo_s
{ {
float vecs[2][4]; float vecs[2][4];
@ -139,13 +129,11 @@ typedef struct texinfo_s
int flags; int flags;
} texinfo_t; } texinfo_t;
/* <487c2> ../engine/bspfile.h:159 */
typedef struct dedge_s typedef struct dedge_s
{ {
unsigned short v[2]; unsigned short v[2];
} dedge_t; } dedge_t;
/* <487f2> ../engine/bspfile.h:165 */
typedef struct dface_s typedef struct dface_s
{ {
short planenum; short planenum;

4
rehlds/public/rehlds/cmd_rehlds.h
View File

@ -29,10 +29,7 @@
#include "archtypes.h" #include "archtypes.h"
/* <8f1> ../engine/cmd.h:65 */
typedef void(*xcommand_t)(void); typedef void(*xcommand_t)(void);
/* <904> ../engine/cmd.h:71 */
typedef struct cmd_function_s typedef struct cmd_function_s
{ {
struct cmd_function_s *next; struct cmd_function_s *next;
@ -41,7 +38,6 @@ typedef struct cmd_function_s
int flags; int flags;
} cmd_function_t; } cmd_function_t;
/* <95a> ../engine/cmd.h:80 */
typedef enum cmd_source_s typedef enum cmd_source_s
{ {
src_client = 0, // came in over a net connection as a clc_stringcmd. host_client will be valid during this state. src_client = 0, // came in over a net connection as a clc_stringcmd. host_client will be valid during this state.

3
rehlds/public/rehlds/common_rehlds.h
View File

@ -47,7 +47,6 @@
#define COM_COPY_CHUNK_SIZE 1024 #define COM_COPY_CHUNK_SIZE 1024
#define COM_MAX_CMD_LINE 256 #define COM_MAX_CMD_LINE 256
/* <6ae> ../common/common.h:82 */
typedef struct sizebuf_s typedef struct sizebuf_s
{ {
const char *buffername; const char *buffername;
@ -57,7 +56,6 @@ typedef struct sizebuf_s
int cursize; int cursize;
} sizebuf_t; } sizebuf_t;
/* <270aa> ../common/common.h:297 */
typedef struct downloadtime_s typedef struct downloadtime_s
{ {
qboolean bUsed; qboolean bUsed;
@ -65,7 +63,6 @@ typedef struct downloadtime_s
int nBytesRemaining; int nBytesRemaining;
} downloadtime_t; } downloadtime_t;
/* <19fa2> ../common/common.h:303 */
typedef struct incomingtransfer_s typedef struct incomingtransfer_s
{ {
qboolean doneregistering; qboolean doneregistering;

17
rehlds/public/rehlds/d_local.h
View File

@ -28,19 +28,16 @@
#pragma once #pragma once
/* <82286> ../engine/d_local.h:20 */
typedef struct surfcache_s typedef struct surfcache_s
{ {
struct surfcache_s *next; struct surfcache_s *next;
struct surfcache_s **owner; struct surfcache_s **owner;
int lightadj[4]; int lightadj[4];
int dlight; int dlight;
int size; int size;
unsigned width; unsigned width;
unsigned height; unsigned height;
float mipscale; float mipscale;
struct texture_s *texture; struct texture_s *texture;
unsigned char data[4]; unsigned char data[4];
} surfcache_t; } surfcache_t;

26
rehlds/public/rehlds/model.h
View File

@ -48,13 +48,11 @@
#define MAXLIGHTMAPS 4 #define MAXLIGHTMAPS 4
#define MAX_KNOWN_MODELS 1024 #define MAX_KNOWN_MODELS 1024
/* <6816> ../engine/model.h:27 */
typedef struct mvertex_s typedef struct mvertex_s
{ {
vec3_t position; vec3_t position;
} mvertex_t; } mvertex_t;
/* <6838> ../engine/model.h:39 */
typedef struct mplane_s typedef struct mplane_s
{ {
vec3_t normal; // surface normal vec3_t normal; // surface normal
@ -64,7 +62,6 @@ typedef struct mplane_s
byte pad[2]; byte pad[2];
} mplane_t; } mplane_t;
/* <68a6> ../engine/model.h:48 */
typedef struct texture_s typedef struct texture_s
{ {
char name[16]; char name[16];
@ -77,14 +74,12 @@ typedef struct texture_s
unsigned paloffset; unsigned paloffset;
} texture_t; } texture_t;
/* <6950> ../engine/model.h:71 */
typedef struct medge_s typedef struct medge_s
{ {
unsigned short v[2]; unsigned short v[2];
unsigned int cachededgeoffset; unsigned int cachededgeoffset;
} medge_t; } medge_t;
/* <697e> ../engine/model.h:78 */
typedef struct mtexinfo_s typedef struct mtexinfo_s
{ {
float vecs[2][4]; // [s/t] unit vectors in world space. float vecs[2][4]; // [s/t] unit vectors in world space.
@ -96,13 +91,10 @@ typedef struct mtexinfo_s
} mtexinfo_t; } mtexinfo_t;
#define TEX_SPECIAL 1 // sky or slime, no lightmap or 256 subdivision #define TEX_SPECIAL 1 // sky or slime, no lightmap or 256 subdivision
/* <69d0> ../engine/model.h:91 */
typedef struct msurface_s msurface_t; typedef struct msurface_s msurface_t;
/* <1db66> ../engine/model.h:92 */
typedef struct decal_s decal_t; typedef struct decal_s decal_t;
// JAY: Compress this as much as possible // JAY: Compress this as much as possible
/* <1db71> ../engine/model.h:96 */
struct decal_s struct decal_s
{ {
decal_t *pnext; // linked list for each surface decal_t *pnext; // linked list for each surface
@ -116,7 +108,6 @@ struct decal_s
short entityIndex; // Entity this is attached to short entityIndex; // Entity this is attached to
}; };
/* <69db> ../engine/model.h:118 */
struct msurface_s struct msurface_s
{ {
int visframe; // should be drawn when node is crossed int visframe; // should be drawn when node is crossed
@ -148,7 +139,6 @@ struct msurface_s
decal_t *pdecals; decal_t *pdecals;
}; };
/* <6b6c> ../engine/model.h:149 */
typedef struct mnode_s typedef struct mnode_s
{ {
// common with leaf // common with leaf
@ -167,7 +157,6 @@ typedef struct mnode_s
unsigned short numsurfaces; unsigned short numsurfaces;
} mnode_t; } mnode_t;
/* <1dcd4> ../engine/model.h:169 */
typedef struct mleaf_s typedef struct mleaf_s
{ {
// common with node // common with node
@ -188,7 +177,6 @@ typedef struct mleaf_s
byte ambient_sound_level[NUM_AMBIENTS]; byte ambient_sound_level[NUM_AMBIENTS];
} mleaf_t; } mleaf_t;
/* <1ddbe> ../engine/model.h:190 */
typedef struct hull_s typedef struct hull_s
{ {
dclipnode_t *clipnodes; dclipnode_t *clipnodes;
@ -198,7 +186,6 @@ typedef struct hull_s
vec3_t clip_mins, clip_maxs; vec3_t clip_mins, clip_maxs;
} hull_t; } hull_t;
/* <4b3fe> ../engine/model.h:210 */
typedef struct mspriteframe_t typedef struct mspriteframe_t
{ {
int width; int width;
@ -208,7 +195,6 @@ typedef struct mspriteframe_t
byte pixels[4]; byte pixels[4];
} mspriteframe_s; } mspriteframe_s;
/* <4b485> ../engine/model.h:219 */
typedef struct mspritegroup_s typedef struct mspritegroup_s
{ {
int numframes; int numframes;
@ -216,14 +202,12 @@ typedef struct mspritegroup_s
mspriteframe_t *frames[1]; mspriteframe_t *frames[1];
} mspritegroup_t; } mspritegroup_t;
/* <4b4df> ../engine/model.h:226 */
typedef struct mspriteframedesc_s typedef struct mspriteframedesc_s
{ {
spriteframetype_t type; spriteframetype_t type;
mspriteframe_t *frameptr; mspriteframe_t *frameptr;
} mspriteframedesc_t; } mspriteframedesc_t;
/* <4b50f> ../engine/model.h:232 */
typedef struct msprite_s typedef struct msprite_s
{ {
short int type; short int type;
@ -236,7 +220,6 @@ typedef struct msprite_s
mspriteframedesc_t frames[1]; mspriteframedesc_t frames[1];
} msprite_t; } msprite_t;
/* <4b5b5> ../engine/model.h:255 */
typedef struct maliasframedesc_s typedef struct maliasframedesc_s
{ {
aliasframetype_t type; aliasframetype_t type;
@ -245,7 +228,6 @@ typedef struct maliasframedesc_s
char name[16]; char name[16];
} maliasframedesc_t; } maliasframedesc_t;
/* <4b615> ../engine/model.h:264 */
typedef struct maliasskindesc_s typedef struct maliasskindesc_s
{ {
aliasskintype_t type; aliasskintype_t type;
@ -253,14 +235,12 @@ typedef struct maliasskindesc_s
int skin; int skin;
} maliasskindesc_t; } maliasskindesc_t;
/* <4b658> ../engine/model.h:271 */
typedef struct maliasgroupframedesc_s typedef struct maliasgroupframedesc_s
{ {
trivertx_t bboxmin, bboxmax; trivertx_t bboxmin, bboxmax;
int frame; int frame;
} maliasgroupframedesc_t; } maliasgroupframedesc_t;
/* <4b69b> ../engine/model.h:278 */
typedef struct maliasgroup_s typedef struct maliasgroup_s
{ {
int numframes; int numframes;
@ -268,7 +248,6 @@ typedef struct maliasgroup_s
maliasgroupframedesc_t frames[1]; maliasgroupframedesc_t frames[1];
} maliasgroup_t; } maliasgroup_t;
/* <4b6ee> ../engine/model.h:285 */
typedef struct maliasskingroup_s typedef struct maliasskingroup_s
{ {
int numskins; int numskins;
@ -276,14 +255,12 @@ typedef struct maliasskingroup_s
maliasskindesc_t skindescs[1]; maliasskindesc_t skindescs[1];
} maliasskingroup_t; } maliasskingroup_t;
/* <4b741> ../engine/model.h:293 */
typedef struct mtriangle_s typedef struct mtriangle_s
{ {
int facesfront; int facesfront;
int vertindex[3]; int vertindex[3];
} mtriangle_t; } mtriangle_t;
/* <4b779> ../engine/model.h:298 */
typedef struct aliashdr_s typedef struct aliashdr_s
{ {
int model; int model;
@ -294,7 +271,6 @@ typedef struct aliashdr_s
maliasframedesc_t frames[1]; maliasframedesc_t frames[1];
} aliashdr_t; } aliashdr_t;
/* <1de30> ../engine/model.h:315 */
typedef enum modtype_e typedef enum modtype_e
{ {
mod_brush, mod_brush,
@ -303,12 +279,10 @@ typedef enum modtype_e
mod_studio, mod_studio,
} modtype_t; } modtype_t;
/* <1de5e> ../engine/model.h:331 */
typedef struct model_s typedef struct model_s
{ {
char name[MAX_MODEL_NAME]; char name[MAX_MODEL_NAME];
//TODO: qboolean? seriously?
int needload; // bmodels and sprites don't cache normally int needload; // bmodels and sprites don't cache normally
modtype_t type; modtype_t type;

16
rehlds/public/rehlds/modelgen.h
View File

@ -32,30 +32,24 @@
#pragma once #pragma once
#endif #endif
/* <67f6> ../engine/modelgen.h:37 */
typedef enum synctype_e typedef enum synctype_e
{ {
ST_SYNC = 0, ST_SYNC = 0,
ST_RAND = 1, ST_RAND = 1,
} synctype_t; } synctype_t;
/* <4abae> ../engine/modelgen.h:40 */
typedef enum aliasframetype_s typedef enum aliasframetype_s
{ {
ALIAS_SINGLE = 0, ALIAS_SINGLE = 0,
ALIAS_GROUP = 1, ALIAS_GROUP = 1,
} aliasframetype_t; } aliasframetype_t;
/* 203 */
/* <4abce> ../engine/modelgen.h:42 */
typedef enum aliasskintype_s typedef enum aliasskintype_s
{ {
ALIAS_SKIN_SINGLE = 0, ALIAS_SKIN_SINGLE = 0,
ALIAS_SKIN_GROUP = 1, ALIAS_SKIN_GROUP = 1,
} aliasskintype_t; } aliasskintype_t;
/* <4abee> ../engine/modelgen.h:44 */
typedef struct mdl_s typedef struct mdl_s
{ {
int ident; int ident;
@ -75,7 +69,6 @@ typedef struct mdl_s
float size; float size;
} mdl_t; } mdl_t;
/* <4acd4> ../engine/modelgen.h:64 */
typedef struct stvert_s typedef struct stvert_s
{ {
int onseam; int onseam;
@ -83,59 +76,50 @@ typedef struct stvert_s
int t; int t;
} stvert_t; } stvert_t;
/* <4ad0e> ../engine/modelgen.h:70 */
typedef struct dtriangle_s typedef struct dtriangle_s
{ {
int facesfront; int facesfront;
int vertindex[3]; int vertindex[3];
} dtriangle_t; } dtriangle_t;
/* <4ad42> ../engine/modelgen.h:80 */
typedef struct trivertx_s typedef struct trivertx_s
{ {
byte v[3]; byte v[3];
byte lightnormalindex; byte lightnormalindex;
} trivertx_t; } trivertx_t;
/* <4ad80> ../engine/modelgen.h:85 */
typedef struct daliasframe_s typedef struct daliasframe_s
{ {
trivertx_t bboxmin, bboxmax; trivertx_t bboxmin, bboxmax;
char name[16]; char name[16];
} daliasframe_t; } daliasframe_t;
/* <4adbe> ../engine/modelgen.h:91 */
typedef struct daliasgroup_s typedef struct daliasgroup_s
{ {
int numframes; int numframes;
trivertx_t bboxmin, bboxmax; trivertx_t bboxmin, bboxmax;
} daliasgroup_t; } daliasgroup_t;
/* <4adfc> ../engine/modelgen.h:97 */
typedef struct daliasskingroup_s typedef struct daliasskingroup_s
{ {
int numskins; int numskins;
} daliasskingroup_t; } daliasskingroup_t;
/* <4ae1e> ../engine/modelgen.h:101 */
typedef struct daliasinterval_s typedef struct daliasinterval_s
{ {
float interval; float interval;
} daliasinterval_t; } daliasinterval_t;
/* <4ae40> ../engine/modelgen.h:105 */
typedef struct daliasskininterval_s typedef struct daliasskininterval_s
{ {
float interval; float interval;
} daliasskininterval_t; } daliasskininterval_t;
/* <4ae62> ../engine/modelgen.h:109 */
typedef struct daliasframetype_s typedef struct daliasframetype_s
{ {
aliasframetype_t type; aliasframetype_t type;
} daliasframetype_t; } daliasframetype_t;
/* <4ae84> ../engine/modelgen.h:113 */
typedef struct daliasskintype_s typedef struct daliasskintype_s
{ {
aliasskintype_t type; aliasskintype_t type;

6
rehlds/public/rehlds/rehlds_api.h
View File

@ -122,8 +122,8 @@ typedef IVoidHookChain<IGameClient *, struct packet_entities_s *, sizebuf_t *> I
typedef IVoidHookChainRegistry<IGameClient *, struct packet_entities_s *, sizebuf_t *> IRehldsHookRegistry_SV_EmitEvents; typedef IVoidHookChainRegistry<IGameClient *, struct packet_entities_s *, sizebuf_t *> IRehldsHookRegistry_SV_EmitEvents;
//EV_PlayReliableEvent hook //EV_PlayReliableEvent hook
typedef IVoidHookChain<IGameClient *, int, short unsigned int, float, struct event_args_s *> IRehldsHook_EV_PlayReliableEvent; typedef IVoidHookChain<IGameClient *, int, unsigned short, float, struct event_args_s *> IRehldsHook_EV_PlayReliableEvent;
typedef IVoidHookChainRegistry<IGameClient *, int, short unsigned int, float, struct event_args_s *> IRehldsHookRegistry_EV_PlayReliableEvent; typedef IVoidHookChainRegistry<IGameClient *, int, unsigned short, float, struct event_args_s *> IRehldsHookRegistry_EV_PlayReliableEvent;
//SV_StartSound hook //SV_StartSound hook
typedef IVoidHookChain<int , edict_t *, int, const char *, int, float, int, int> IRehldsHook_SV_StartSound; typedef IVoidHookChain<int , edict_t *, int, const char *, int, float, int, int> IRehldsHook_SV_StartSound;
@ -257,7 +257,7 @@ struct RehldsFuncs_t {
cmd_source_t*(*GetCmdSource)(); cmd_source_t*(*GetCmdSource)();
void(*Log)(const char* prefix, const char* msg); void(*Log)(const char* prefix, const char* msg);
DLL_FUNCTIONS *(*GetEntityInterface)(); DLL_FUNCTIONS *(*GetEntityInterface)();
void(*EV_PlayReliableEvent)(IGameClient *cl, int entindex, short unsigned int eventindex, float delay, struct event_args_s *pargs); void(*EV_PlayReliableEvent)(IGameClient *cl, int entindex, unsigned short eventindex, float delay, struct event_args_s *pargs);
int(*SV_LookupSoundIndex)(const char *sample); int(*SV_LookupSoundIndex)(const char *sample);
void(*MSG_StartBitWriting)(sizebuf_t *buf); void(*MSG_StartBitWriting)(sizebuf_t *buf);
void(*MSG_WriteBits)(uint32 data, int numbits); void(*MSG_WriteBits)(uint32 data, int numbits);

Some files were not shown because too many files have changed in this diff Show More