Skip to content

Astar #1236

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

Open
cyberjunk wants to merge 14 commits into
base: develop
Choose a base branch
from
Open

Astar #1236

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
2daa880
Astar
Oct 15, 2015
4b705d7
define value for edgescache
Oct 22, 2015
840996b
Merge branch 'develop' of https://github.com/OpenMeridian/Meridian59 …
Oct 23, 2015
bd539d7
Path caching
Oct 23, 2015
6c7d948
Refactoring (remove room1:1astar)
Oct 25, 2015
ae6be31
More refactoring
Oct 25, 2015
b065cca
more astar refactoring
Oct 26, 2015
2e97455
meta grid/less mem
Oct 27, 2015
96ee9d9
no neighbour ptr
Oct 27, 2015
3d0f86c
mem usage output formatting astar
Oct 27, 2015
232a9bd
refactoring
Oct 29, 2015
01b578d
Merge branch 'develop' of https://github.com/OpenMeridian/Meridian59 …
Oct 30, 2015
2581b49
Multithreaded Astar
Oct 30, 2015
8c647c1
Merge branch 'develop' of https://github.com/OpenMeridian/Meridian59 …
Dec 13, 2015
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
7 changes: 7 additions & 0 deletions blakcomp/function.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,13 @@ id_struct BuiltinIds[] = {
{"realtime", I_MISSING, 36, 0, I_CLASS},
{"gameeventengine",I_MISSING, 37, 0, I_CLASS},
{"escapedconvict",I_MISSING, 38, 0, I_CLASS},
{"MoveCallback", I_MISSING, 39, 0, I_MESSAGE },
{"iRow", I_MISSING, 40, 0, I_PARAMETER },
{"iCol", I_MISSING, 41, 0, I_PARAMETER },
{"iFineRow", I_MISSING, 42, 0, I_PARAMETER },
{"iFineCol", I_MISSING, 43, 0, I_PARAMETER },
{"iType", I_MISSING, 44, 0, I_PARAMETER },
{"iFlags", I_MISSING, 45, 0, I_PARAMETER },
};

int numbuiltins = (sizeof(BuiltinIds)/sizeof(id_struct));
4 changes: 2 additions & 2 deletions blakserv/adminfn.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1409,10 +1409,10 @@ void AdminShowMemory(int session_id,admin_parm_type parms[],
aprintf("%s\n",TimeStr(GetTime()));
for (i=0;i<GetNumMemoryStats();i++)
{
aprintf("%-20s %8lu\n",GetMemoryStatName(i),mstat->allocated[i]);
aprintf("%-20s %9lu\n",GetMemoryStatName(i),mstat->allocated[i]);
total += mstat->allocated[i];
}
aprintf("%-20s %4lu MB\n","-- Total",total/1024/1024);
aprintf("%-20s %6lu MB\n","-- Total",total/1024/1024);

aprintf("-------------------------------------------\n");
}
Expand Down
Loading