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.

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

Implement asRenderWeb::Load #163

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions code/midtown/localize/lang_english.h
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@ X(MM_IDS_14, "Loading facades...")
X(MM_IDS_15, "Gill Sans MT, 12, 24, 0, 400")
X(MM_IDS_16, "Gill Sans MT, 12, 16, 0, 400")
X(MM_IDS_17, "%d%% complete...")
X(MM_IDS_18, "Loading static terrain...")
X(MM_IDS_19, "Loading portal information...")
X(MM_IDS_20, "Loading collision database...")
X(MM_IDS_LOADING_STATIC_TERRAIN, "Loading static terrain...")
X(MM_IDS_LOADING_PORTAL_INFO, "Loading portal information...")
X(MM_IDS_LOADING_COLLISION_DATABASE, "Loading collision database...")
X(MM_IDS_PLAYER_NAME, "Player")
X(MM_IDS_LOADING_AUDIO, "Loading audio...")
X(MM_IDS_LOADING_CITY, "Loading city...")
Expand Down
6 changes: 3 additions & 3 deletions code/midtown/localize/lang_german.h
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@ X(MM_IDS_14, "Fassaden werden geladen...")
X(MM_IDS_15, "Gill Sans MT, 12, 24, 0, 400")
X(MM_IDS_16, "Gill Sans MT, 12, 16, 0, 400")
X(MM_IDS_17, "%d%% abgeschlossen...")
X(MM_IDS_18, "Statisches Gelände wird geladen...")
X(MM_IDS_19, "Eingangsdaten werden geladen...")
X(MM_IDS_20, "Kollisionsdatenbank wird geladen...")
X(MM_IDS_LOADING_STATIC_TERRAIN, "Statisches Gelände wird geladen...")
X(MM_IDS_LOADING_PORTAL_INFO, "Eingangsdaten werden geladen...")
X(MM_IDS_LOADING_COLLISION_DATABASE, "Kollisionsdatenbank wird geladen...")
X(MM_IDS_PLAYER_NAME, "Spieler")
X(MM_IDS_LOADING_AUDIO, "Audio wird geladen...")
X(MM_IDS_LOADING_CITY, "Stadt wird geladen...")
Expand Down
6 changes: 3 additions & 3 deletions code/midtown/localize/lang_japan.h
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@ X(MM_IDS_14, "建物データをロード中")
X(MM_IDS_15, "MS Pゴシック, 10,14, 128, 400")
X(MM_IDS_16, "MS Pゴシック, 10, 12, 128, 400")
X(MM_IDS_17, "%d%% ロード完了...")
X(MM_IDS_18, "地形データをロード中")
X(MM_IDS_19, "橋データをロード中")
X(MM_IDS_20, "衝突データベースをロード中")
X(MM_IDS_LOADING_STATIC_TERRAIN, "地形データをロード中")
X(MM_IDS_LOADING_PORTAL_INFO, "橋データをロード中")
X(MM_IDS_LOADING_COLLISION_DATABASE, "衝突データベースをロード中")
X(MM_IDS_PLAYER_NAME, "プレイヤー")
X(MM_IDS_LOADING_AUDIO, "オーディオをロード中")
X(MM_IDS_LOADING_CITY, "シティー データをロード中")
Expand Down
6 changes: 3 additions & 3 deletions code/midtown/localize/lang_russian.h
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@ X(MM_IDS_14, "Загружаю фасады...")
X(MM_IDS_15, "System, 11, 22, 0, 400")
X(MM_IDS_16, "System, 11, 14, 0, 400")
X(MM_IDS_17, "%d%% закончено...")
X(MM_IDS_18, "Загружаю статические объекты...")
X(MM_IDS_19, "Загружаю порталы...")
X(MM_IDS_20, "Загружаю информацю о происшествиях...")
X(MM_IDS_LOADING_STATIC_TERRAIN, "Загружаю статические объекты...")
X(MM_IDS_LOADING_PORTAL_INFO, "Загружаю порталы...")
X(MM_IDS_LOADING_COLLISION_DATABASE, "Загружаю информацю о происшествиях...")
X(MM_IDS_PLAYER_NAME, "Игрок")
X(MM_IDS_LOADING_AUDIO, "Загружаю звук...")
X(MM_IDS_LOADING_CITY, "Загружаю город...")
Expand Down
6 changes: 3 additions & 3 deletions code/midtown/localize/string_ids.h
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@
#define MM_IDS_15 15
#define MM_IDS_16 16
#define MM_IDS_17 17
#define MM_IDS_18 18
#define MM_IDS_19 19
#define MM_IDS_20 20
#define MM_IDS_LOADING_STATIC_TERRAIN 18
#define MM_IDS_LOADING_PORTAL_INFO 19
#define MM_IDS_LOADING_COLLISION_DATABASE 20
#define MM_IDS_PLAYER_NAME 21
#define MM_IDS_LOADING_AUDIO 22
#define MM_IDS_LOADING_CITY 23
Expand Down
14 changes: 14 additions & 0 deletions code/midtown/mmcity/portal.h
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@
*/

#include "arts7/node.h"
#include "vector7/vector3.h"
#include "vector7/vector4.h"

struct asPortalCell;
Expand Down Expand Up @@ -96,6 +97,19 @@ struct asPortalCell
struct PtlPath** PtlPaths;
};

struct PtlPortal
{
u8 Flags;
i8 EdgeCount;
i16 gap2;
i16 Cell1;
i16 Cell2;
f32 Height;
Vector3 Min;
Vector3 Max;
Vector3 ExtraEdge;
};

check_size(asPortalCell, 0x18);

class asPortalWeb : public asNode
Expand Down
Loading