etc/sm64coopdx
0
0
Fork 0
mirror of https://github.com/coop-deluxe/sm64coopdx.git synced 2024-11-28 23:13:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

Revert object pool increase due to coop compatibility

Browse source 
This reverts commit e467f6ed68.
This commit is contained in:
Agent X 2024-02-29 17:57:46 -05:00
parent e467f6ed68
commit 23a217fd77
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
autogen/lua_definitions/constants.lua
View file

@ -7644,7 +7644,7 @@ YOSHI_ACT_WALK = 1
YOSHI_ACT_WALK_JUMP_OFF_ROOF = 3 YOSHI_ACT_WALK_JUMP_OFF_ROOF = 3
--- @type integer --- @type integer
OBJECT_POOL_CAPACITY = 1200 OBJECT_POOL_CAPACITY = 960
--- @type integer --- @type integer
TIME_STOP_ACTIVE = (1 << 6) TIME_STOP_ACTIVE = (1 << 6)

2
src/game/object_list_processor.h
View file

@ -23,7 +23,7 @@
/** /**
* The maximum number of objects that can be loaded at once. * The maximum number of objects that can be loaded at once.
*/ */
#define OBJECT_POOL_CAPACITY 1200 #define OBJECT_POOL_CAPACITY 960
/** /**
* Every object is categorized into an object list, which controls the order * Every object is categorized into an object list, which controls the order

2
src/pc/lua/smlua_constants_autogen.c
View file

@ -2760,7 +2760,7 @@ char gSmluaConstants[] = ""
"TIME_STOP_ALL_OBJECTS = (1 << 4)\n" "TIME_STOP_ALL_OBJECTS = (1 << 4)\n"
"TIME_STOP_MARIO_OPENED_DOOR = (1 << 5)\n" "TIME_STOP_MARIO_OPENED_DOOR = (1 << 5)\n"
"TIME_STOP_ACTIVE = (1 << 6)\n" "TIME_STOP_ACTIVE = (1 << 6)\n"
"OBJECT_POOL_CAPACITY = 1200\n" "OBJECT_POOL_CAPACITY = 960\n"
"OBJ_LIST_PLAYER = 0\n" "OBJ_LIST_PLAYER = 0\n"
"OBJ_LIST_UNUSED_1 = 1\n" "OBJ_LIST_UNUSED_1 = 1\n"
"OBJ_LIST_DESTRUCTIVE = 2\n" "OBJ_LIST_DESTRUCTIVE = 2\n"