Add mapper_main

This commit is contained in:
Alexander Batalov 2023-07-23 11:01:03 +03:00
parent 7327588fc3
commit cdfd308193
4 changed files with 45 additions and 4 deletions

View File

@ -10,6 +10,7 @@
#include "inventory.h" #include "inventory.h"
#include "kb.h" #include "kb.h"
#include "mapper/mp_proto.h" #include "mapper/mp_proto.h"
#include "memory.h"
#include "object.h" #include "object.h"
#include "proto.h" #include "proto.h"
#include "settings.h" #include "settings.h"
@ -19,6 +20,8 @@
namespace fallout { namespace fallout {
static void MapperInit(); static void MapperInit();
static int mapper_edit_init(int argc, char** argv);
static void mapper_edit_exit();
static int bookmarkInit(); static int bookmarkInit();
static int bookmarkExit(); static int bookmarkExit();
static void bookmarkHide(); static void bookmarkHide();
@ -29,6 +32,7 @@ static int categoryHide();
static int categoryToggleState(); static int categoryToggleState();
static int categoryUnhide(); static int categoryUnhide();
static bool proto_user_is_librarian(); static bool proto_user_is_librarian();
static void edit_mapper();
static void redraw_toolname(); static void redraw_toolname();
static void clear_toolname(); static void clear_toolname();
static void update_high_obj_name(Object* obj); static void update_high_obj_name(Object* obj);
@ -62,6 +66,24 @@ unsigned char* tool;
// 0x6EC4AC // 0x6EC4AC
int tool_win; int tool_win;
// gnw_main
// 0x485DD0
int mapper_main(int argc, char** argv)
{
MapperInit();
if (mapper_edit_init(argc, argv) == -1) {
mem_check();
return 0;
}
edit_mapper();
mapper_edit_exit();
mem_check();
return 0;
}
// 0x485E00 // 0x485E00
void MapperInit() void MapperInit()
{ {
@ -106,6 +128,20 @@ void MapperInit()
menu_val_2[7] = 5544; menu_val_2[7] = 5544;
} }
// 0x485F94
int mapper_edit_init(int argc, char** argv)
{
// TODO: Incomplete.
return 0;
}
// 0x48752C
void mapper_edit_exit()
{
// TODO: Incomplete.
}
// 0x4875B4 // 0x4875B4
int bookmarkInit() int bookmarkInit()
{ {
@ -207,6 +243,12 @@ bool proto_user_is_librarian()
return true; return true;
} }
// 0x4877D0
void edit_mapper()
{
// TODO: Incomplete.
}
// 0x48B16C // 0x48B16C
void print_toolbar_name(int object_type) void print_toolbar_name(int object_type)
{ {

View File

@ -14,6 +14,7 @@ extern int menu_val_1[21];
extern unsigned char* tool; extern unsigned char* tool;
extern int tool_win; extern int tool_win;
int mapper_main(int argc, char** argv);
void print_toolbar_name(int object_type); void print_toolbar_name(int object_type);
int mapper_inven_unwield(Object* obj, int right_hand); int mapper_inven_unwield(Object* obj, int right_hand);

View File

@ -32,7 +32,6 @@ typedef struct MemoryBlockFooter {
static void* memoryBlockMallocImpl(size_t size); static void* memoryBlockMallocImpl(size_t size);
static void* memoryBlockReallocImpl(void* ptr, size_t size); static void* memoryBlockReallocImpl(void* ptr, size_t size);
static void memoryBlockFreeImpl(void* ptr); static void memoryBlockFreeImpl(void* ptr);
static void memoryBlockPrintStats();
static void* mem_prep_block(void* block, size_t size); static void* mem_prep_block(void* block, size_t size);
static void memoryBlockValidate(void* block); static void memoryBlockValidate(void* block);
@ -176,10 +175,8 @@ static void memoryBlockFreeImpl(void* ptr)
} }
} }
// NOTE: Not used.
//
// 0x4C5C5C // 0x4C5C5C
static void memoryBlockPrintStats() void mem_check()
{ {
if (gMallocProc == memoryBlockMallocImpl) { if (gMallocProc == memoryBlockMallocImpl) {
debugPrint("Current memory allocated: %6d blocks, %9u bytes total\n", gMemoryBlocksCurrentCount, gMemoryBlocksCurrentSize); debugPrint("Current memory allocated: %6d blocks, %9u bytes total\n", gMemoryBlocksCurrentCount, gMemoryBlocksCurrentSize);

View File

@ -9,6 +9,7 @@ char* internal_strdup(const char* string);
void* internal_malloc(size_t size); void* internal_malloc(size_t size);
void* internal_realloc(void* ptr, size_t size); void* internal_realloc(void* ptr, size_t size);
void internal_free(void* ptr); void internal_free(void* ptr);
void mem_check();
} // namespace fallout } // namespace fallout