Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

rename classes, create methods, rename RPCs #15

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
+448 −392
Open

rename classes, create methods, rename RPCs #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fb456a2
rename RPCs
Tornamic Nov 26, 2024
c16984c
rename unkclass14 -> objecttext, determine some unkclass10 methods
Tornamic Nov 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
238 changes: 119 additions & 119 deletions bot/net/scriptrpc.cpp
View file
Open in desktop

Large diffs are not rendered by default.

Binary file modified idb/saco/samp.idb
View file
Open in desktop
Binary file not shown.
128 changes: 64 additions & 64 deletions raknet/SAMPRPC.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,56 +79,56 @@
#define RPC_CameraTarget "\xA8"
#define RPC_ActorDamage "\xB1"

#define RPC_ScrUnkA7 "\xA7"
#define RPC_ScrUnk38 "\x38"
#define RPC_ScrUnk90 "\x90"
#define RPC_ScrUnk91 "\x91"
#define RPC_ScrDisableVehicleCollisions "\xA7"
#define RPC_ScrSetMapIcon "\x38"
#define RPC_ScrRemoveMapIcon "\x90"
#define RPC_ScrSetWeaponAmmo "\x91"
#define RPC_ScrSetGravity "\x92"
#define RPC_ScrUnk93 "\x93"
#define RPC_ScrUnk94 "\x94"
#define RPC_ScrUnk95 "\x95"
#define RPC_ScrUnk2C "\x2C"
#define RPC_ScrUnk2D "\x2D"
#define RPC_ScrUnk2E "\x2E"
#define RPC_ScrUnk2F "\x2F"
#define RPC_ScrUnk4F "\x4F"
#define RPC_ScrUnk50 "\x50"
#define RPC_ScrUnk63 "\x63"
#define RPC_ScrUnk7A "\x7A"
#define RPC_ScrUnk7B "\x7B"
#define RPC_ScrUnk7C "\x7C"
#define RPC_ScrSetVehicleHealth "\x93"
#define RPC_ScrAttachTrailerToVehicle "\x94"
#define RPC_ScrDetachTrailerFromVehicle "\x95"
#define RPC_ScrCreateObject "\x2C"
#define RPC_ScrSetObjectPos "\x2D"
#define RPC_ScrSetObjectRotation "\x2E"
#define RPC_ScrDestroyObject "\x2F"
#define RPC_ScrCreateExplosion "\x4F"
#define RPC_ScrShowPlayerNameTag "\x50"
#define RPC_ScrMoveObject "\x63"
#define RPC_ScrStopObject "\x7A"
#define RPC_ScrSetVehicleNumberPlate "\x7B"
#define RPC_ScrTogglePlayerSpectating "\x7C"
#define RPC_ScrUnk7D "\x7D"
#define RPC_ScrUnk7E "\x7E"
#define RPC_ScrUnk7F "\x7F"
#define RPC_ScrUnk39 "\x39"
#define RPC_ScrSpectatePlayer "\x7E"
#define RPC_ScrSpectateVehicle "\x7F"
#define RPC_ScrRemoveVehicleComponent "\x39"
#define RPC_ScrForceSpawnSelection "\x4A"
#define RPC_ScrUnk4B "\x4B"
#define RPC_ScrUnk85 "\x85"
#define RPC_ScrUnk86 "\x86"
#define RPC_ScrUnk87 "\x87"
#define RPC_ScrUnk69 "\x69"
#define RPC_ScrAttachObjectToPlayer "\x4B"
#define RPC_ScrSetPlayerWantedLevel "\x85"
#define RPC_ScrShowTextDraw "\x86"
#define RPC_ScrHideTextDraw "\x87"
#define RPC_ScrTextDrawSetString "\x69"
#define RPC_ScrAddGangZone "\x6C"
#define RPC_ScrRemoveGangZone "\x78"
#define RPC_ScrFlashGangZone "\x79"
#define RPC_ScrStopFlashGangZone "\x55"
#define RPC_ScrUnk56 "\x56"
#define RPC_ScrUnk57 "\x57"
#define RPC_ScrUnk58 "\x58"
#define RPC_ScrApplyPlayerAnimation "\x56"
#define RPC_ScrClearPlayerAnimation "\x57"
#define RPC_ScrSetPlayerSpecialAction "\x58"
#define RPC_ScrEnableStuntBonus "\x68"
#define RPC_ScrUnk59 "\x59"
#define RPC_ScrUnk5A "\x5A"
#define RPC_ScrUnk5B "\x5B"
#define RPC_ScrUnk6F "\x6F"
#define RPC_ScrUnk62 "\x62"
#define RPC_ScrSetPlayerFightingStyle "\x59"
#define RPC_ScrSetPlayerVelocity "\x5A"
#define RPC_ScrSetVehicleVelocity "\x5B"
#define RPC_ScrToggleWidescreen "\x6F"
#define RPC_ScrSetVehicleTireStatus "\x62"
#define RPC_ScrSetPlayerDrunkVisuals "\x5C"
#define RPC_ScrSetPlayerDrunkHandling "\x96"
#define RPC_ScrUnk70 "\x70"
#define RPC_ScrPlayCrimeReport "\x70"
#define RPC_ScrSetSpawnInfo "\x44"
#define RPC_ScrUnk45 "\x45"
#define RPC_ScrUnk99 "\x99"
#define RPC_ScrSetPlayerTeam "\x45"
#define RPC_ScrSetPlayerSkin "\x99"
#define RPC_ScrSetPlayerName "\x0B"
#define RPC_ScrSetPlayerPos "\x0C"
#define RPC_ScrUnk0D "\x0D"
#define RPC_ScrSetPlayerPosFindZ "\x0D"
#define RPC_ScrSetPlayerHealth "\x0E"
#define RPC_ScrPutPlayerInVehicle "\x46"
#define RPC_ScrRemovePlayerFromVehicle "\x47"
Expand All @@ -137,39 +137,39 @@
#define RPC_ScrSetInterior "\x9C"
#define RPC_ScrSetCameraPos "\x9D"
#define RPC_ScrSetCameraLookAt "\x9E"
#define RPC_ScrUnk9F "\x9F"
#define RPC_ScrUnkA0 "\xA0"
#define RPC_ScrUnkA1 "\xA1"
#define RPC_ScrSetVehiclePos "\x9F"
#define RPC_ScrSetVehicleZAngle "\xA0"
#define RPC_ScrSetVehicleParams "\xA1"
#define RPC_ScrSetCameraBehindPlayer "\xA2"
#define RPC_ScrUnk0F "\x0F"
#define RPC_ScrUnk10 "\x10"
#define RPC_ScrUnk11 "\x11"
#define RPC_ScrUnk12 "\x12"
#define RPC_ScrTogglePlayerControllable "\x0F"
#define RPC_ScrPlaySound "\x10"
#define RPC_ScrSetWorldBounds "\x11"
#define RPC_ScrGivePlayerMoney "\x12"
#define RPC_ScrSetPlayerFacingAngle "\x13"
#define RPC_ScrResetMoney "\x14"
#define RPC_ScrResetPlayerWeapons "\x15"
#define RPC_ScrUnk16 "\x16"
#define RPC_ScrGivePlayerWeapon "\x16"
#define RPC_ScrUnk40 "\x40"
#define RPC_ScrUnk41 "\x41"
#define RPC_ScrUnk42 "\x42"
#define RPC_ScrUnk37 "\x37"
#define RPC_ScrUnk21 "\x21"
#define RPC_ScrUnk23 "\x23"
#define RPC_ScrUnk43 "\x43"
#define RPC_ScrUnk71 "\x71"
#define RPC_ScrUnk29 "\x29"
#define RPC_ScrUnk2A "\x2A"
#define RPC_ScrUnk2B "\x2B"
#define RPC_ScrUnk51 "\x51"
#define RPC_ScrUnk52 "\x52"
#define RPC_ScrUnk53 "\x53"
#define RPC_ScrUnk54 "\x54"
#define RPC_ScrLinkVehicleToInterior "\x41"
#define RPC_ScrSetPlayerArmour "\x42"
#define RPC_ScrSendDeathMessage "\x37"
#define RPC_ScrSetShopName "\x21"
#define RPC_ScrSetPlayerDrunkLevel "\x23"
#define RPC_ScrSetArmedWeapon "\x43"
#define RPC_ScrSetPlayerAttachedObject "\x71"
#define RPC_ScrPlayAudioStream "\x29"
#define RPC_ScrStopAudioStream "\x2A"
#define RPC_ScrRemoveBuilding "\x2B"
#define RPC_ScrAttachCameraToObject "\x51"
#define RPC_ScrInterpolateCamera "\x52"
#define RPC_ScrToggleSelectTextDraw "\x53"
#define RPC_ScrSetPlayerObjectMaterial "\x54"
#define RPC_ScrUnkA9 "\xA9"
#define RPC_ScrUnkAD "\xAD"
#define RPC_ScrUnkAE "\xAE"
#define RPC_ScrUnkAF "\xAF"
#define RPC_ScrUnkB0 "\xB0"
#define RPC_ScrUnkB2 "\xB2"
#define RPC_ScrApplyActorAnimation "\xAD"
#define RPC_ScrClearActorAnimation "\xAE"
#define RPC_ScrSetActorFacingAngle "\xAF"
#define RPC_ScrSetActorPos "\xB0"
#define RPC_ScrSetActorHealth "\xB2"
#define RPC_ScrUnk30 "\x30"
#define RPC_ScrInitMenu "\x4C"
#define RPC_ScrShowMenu "\x4D"
Expand Down
4 changes: 2 additions & 2 deletions saco/game/font.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,15 +133,15 @@ NUDE Font_SetShadow(int shadow)

//-----------------------------------------------------------

NUDE Font_UnkConv(char *sz, int param1, int param2, int param3, int param4, int param5, int param6, char * buf)
NUDE Font_InsertNumber(char *sz, int param1, int param2, int param3, int param4, int param5, int param6, char * buf)
{
_asm mov eax, 0x69DE90
_asm ret
}

//-----------------------------------------------------------

NUDE Font_UnkConv2(char *sz)
NUDE Font_InsertPlayerControlKeys(char *sz)
{
_asm mov eax, 0x69E160
_asm jmp eax
Expand Down
4 changes: 2 additions & 2 deletions saco/game/font.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,5 @@ void Font_UseBoxColor(DWORD color);
void Font_SetLineWidth(float width);
void Font_SetLineHeight(float height);
void Font_SetShadow(int shadow);
void Font_UnkConv(char *sz, int param1, int param2, int param3, int param4, int param5, int param6, char * buf);
void Font_UnkConv2(char *sz);
void Font_InsertNumber(char *sz, int param1, int param2, int param3, int param4, int param5, int param6, char * buf);
void Font_InsertPlayerControlKeys(char *sz);
2 changes: 1 addition & 1 deletion saco/game/util.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1961,7 +1961,7 @@ void RemoveColorEmbedsFromString(char *szString)
*szString = 0;
}

DWORD unnamed_100B6100(char *szString, int nMaxLen)
DWORD InsertPlayerControlKeysInString(char *szString, int nMaxLen)
{
char tmp_buf[2049];
memset(tmp_buf, 0, sizeof(tmp_buf));
Expand Down
2 changes: 1 addition & 1 deletion saco/game/util.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ void SaveCameraRaster(char *filename);

BOOL IsFileOrDirectoryExists(char * szPath);

DWORD unnamed_100B6100(char *szString, int nMaxLen);
DWORD InsertPlayerControlKeysInString(char *szString, int nMaxLen);

bool FUNC_100B4B50(VECTOR *vecPos);

Expand Down
4 changes: 2 additions & 2 deletions saco/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ CNetGame *pNetGame=0;
//DWORD dword_1026EB98=0;
CFontRender *pDefaultFont=0;
CUnkClass13 *pUnkClass13=0;
CUnkClass14 *pUnkClass14=0;
CObjectText *pObjectText=0;
CUnkClass15 *pUnkClass15=0;

BOOL bGameInited=FALSE;
Expand Down Expand Up @@ -373,7 +373,7 @@ void DoInitStuff()
pUnkClass11 = new CUnkClass11();
pUnkClass12 = new CUnkClass12();
pUnkClass13 = new CUnkClass13(pD3DDevice);
pUnkClass14 = new CUnkClass14(pD3DDevice);
pObjectText = new CObjectText(pD3DDevice);
pUnkClass15 = new CUnkClass15();

// Setting up the commands.
Expand Down
2 changes: 1 addition & 1 deletion saco/main.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ typedef struct _GAME_SETTINGS {
#include "unkclass11.h"
#include "unkclass12.h"
#include "unkclass13.h"
#include "unkclass14.h"
#include "objecttext.h"
#include "unkclass15.h"

void SetStringFromCommandLine(char *szCmdLine, char *szString);
Expand Down
Loading