rooty/HLMetaModOfficial
1
0
Fork 0
mirror of https://github.com/alliedmodders/metamod-source.git synced 2025-01-30 19:52:17 +01:00
Code Issues Releases Activity

added svn:keywords property

Browse Source 
--HG--
branch : sourcemm-1.6.0
extra : convert_revision : svn%3Ac2935e3e-5518-0410-8daf-afa5dab7d4e3/branches/sourcemm-1.6.0%40430
This commit is contained in:
David Anderson 2007-09-27 18:12:20 +00:00
parent 11fd69452f
commit 2542b0471e
5 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sourcemm/ISmmAPI.h
View File

@ -360,3 +360,4 @@ public: // Added in 1.6.0 (1:7)
*/
#endif //_INCLUDE_ISMM_API_H

1
sourcemm/ISmmPlugin.h
View File

@ -435,3 +435,4 @@ public:
}
#endif //_INCLUDE_ISMM_PLUGIN_H

9
sourcemm/Makefile
View File

@ -1,7 +1,7 @@
#(C)2004-2007 SourceMM Development Team
# Makefile written by David "BAILOPAN" Anderson
HL2SDK = ../../hl2sdk
HL2SDK = ../../../hl2sdk
SMM_ROOT = ..
SRCDS = ~/srcds
@ -16,10 +16,9 @@ BINARY = server_i486.so
HL2PUB = $(HL2SDK)/public
HL2LIB = $(HL2SDK)/linux_sdk
OBJECTS = oslink.cpp util.cpp concommands.cpp CSmmAPI.cpp \
sourcemm.cpp CPlugin.cpp sourcehook.cpp vsp_listener.cpp
OBJECTS = oslink.cpp metamod_util.cpp metamod.cpp
LINK = $(HL2LIB)/tier1_i486.a vstdlib_i486.so tier0_i486.so -static-libgcc
LINK = -static-libgcc
INCLUDE = -I. -I$(HL2PUB) -I$(HL2PUB)/dlls -I$(HL2PUB)/engine -I$(HL2PUB)/tier0 -I$(HL2PUB)/tier1 \
-I$(HL2PUB)/vstdlib -I$(HL2SDK)/tier1 -I$(SMM_ROOT) -I$(SMM_ROOT)/sourcehook
@ -47,8 +46,6 @@ $(BIN_DIR)/%.o: %.cpp
all:
mkdir -p $(BIN_DIR)
ln -sf $(SRCDS)/bin/vstdlib_i486.so vstdlib_i486.so
ln -sf $(SRCDS)/bin/tier0_i486.so tier0_i486.so
ln -sf $(SMM_ROOT)/sourcehook/sourcehook.cpp sourcehook.cpp
$(MAKE) sourcemm
rm -rf $(BINARY)

2
sourcemm/metamod.cpp
View File

@ -589,7 +589,7 @@ void InitializeVSP()
char engine_path[PATH_SIZE];
char rel_path[PATH_SIZE * 2];
GetFileOfAddress(engine_factory, engine_file, sizeof(engine_file));
GetFileOfAddress((void *)engine_factory, engine_file, sizeof(engine_file));
/* Chop off the "engine" file part */
len = strlen(engine_file);

11
sourcemm/oslink.cpp
View File

@ -14,6 +14,7 @@
*/
#include "oslink.h"
#include <malloc.h>
#ifdef __linux
#include <errno.h>
#include <stdio.h>
@ -70,21 +71,19 @@ bool GetFileOfAddress(void *pAddr, char *buffer, size_t maxlength)
#if defined __GNUC__ && (__GNUC__ == 3 || __GNUC__ == 4)
void * operator new(size_t size) {
return(calloc(1, size));
return malloc(size);
}
void * operator new[](size_t size) {
return(calloc(1, size));
return malloc(size);
}
void operator delete(void * ptr) {
if(ptr)
free(ptr);
free(ptr);
}
void operator delete[](void * ptr) {
if(ptr)
free(ptr);
free(ptr);
}
#endif