thirdpartymirrors/sm64coopdx
1
0
Fork 0
mirror of https://github.com/coop-deluxe/sm64coopdx.git synced 2025-10-30 08:01:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Removed player offset when changing areas

Browse source
This commit is contained in:
MysterD 2021-09-05 14:34:17 -07:00
parent 4cebce4864
commit 3721877b6a
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
developer/network.sh
View file

@ -19,8 +19,8 @@ fi
# no debug, direct # no debug, direct
$FILE --server 27015 --configfile sm64config_server.txt & $FILE --server 27015 --configfile sm64config_server.txt &
#sleep 7 sleep 7
#$FILE --client 127.0.0.1 27015 --configfile sm64config_client.txt & $FILE --client 127.0.0.1 27015 --configfile sm64config_client.txt &
exit exit
# debug on server # debug on server

5
src/game/level_update.c
View file

@ -385,6 +385,8 @@ void set_mario_initial_action(struct MarioState *m, u32 spawnType, u32 actionArg
set_mario_initial_cap_powerup(m); set_mario_initial_cap_powerup(m);
} }
#include "pc/debuglog.h"
void init_mario_after_warp(void) { void init_mario_after_warp(void) {
struct ObjectWarpNode *spawnNode = area_get_warp_node(sWarpDest.nodeId); struct ObjectWarpNode *spawnNode = area_get_warp_node(sWarpDest.nodeId);
u32 marioSpawnType = get_mario_spawn_type(spawnNode->object); u32 marioSpawnType = get_mario_spawn_type(spawnNode->object);
@ -429,7 +431,7 @@ void init_mario_after_warp(void) {
set_mario_initial_action(gMarioState, marioSpawnType, sWarpDest.arg); set_mario_initial_action(gMarioState, marioSpawnType, sWarpDest.arg);
// remove offset from local mario during warps // remove offset from local mario during warps
if (sWarpDest.type == WARP_TYPE_SAME_AREA) { if ((sWarpDest.type == WARP_TYPE_SAME_AREA) || (sWarpDest.type == WARP_TYPE_CHANGE_AREA)) {
gMarioState[0].pos[0] = (s16)spawnNode->object->oPosX; gMarioState[0].pos[0] = (s16)spawnNode->object->oPosX;
gMarioState[0].pos[1] = (s16)spawnNode->object->oPosY; gMarioState[0].pos[1] = (s16)spawnNode->object->oPosY;
gMarioState[0].pos[2] = (s16)spawnNode->object->oPosZ; gMarioState[0].pos[2] = (s16)spawnNode->object->oPosZ;
@ -438,6 +440,7 @@ void init_mario_after_warp(void) {
gMarioState[0].marioObj->oPosY = spawnNode->object->oPosY; gMarioState[0].marioObj->oPosY = spawnNode->object->oPosY;
gMarioState[0].marioObj->oPosZ = spawnNode->object->oPosZ; gMarioState[0].marioObj->oPosZ = spawnNode->object->oPosZ;
} }
LOG_INFO(">>> override offset spawn <<<");
} }
gMarioState->interactObj = spawnNode->object; gMarioState->interactObj = spawnNode->object;