X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fmain.cpp;h=4c350de35f3e48432c40ef98cdb54c4826612745;hb=559457f14d914f6b1cb5d588a0ccf97529f011d1;hp=b06b5c7533b1e463460461bafe613af016acf743;hpb=57a75f13e98f4b5d311c2d3b9d9ff637120c5ee2;p=l2e.git

diff --git a/src/main.cpp b/src/main.cpp
index b06b5c7..4c350de 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -86,8 +86,8 @@ using std::string;
 using std::vector;
 
 int main(int argc, char **argv) {
-	const int width = 800;
-	const int height = 480;
+	const int width = 512;
+	const int height = 448;
 
 	const float walkSpeed = 128.0f;
 
@@ -191,6 +191,7 @@ int main(int argc, char **argv) {
 		gameState.party[1] = &gameState.heroes[1];
 		gameState.party[2] = &gameState.heroes[2];
 		gameState.party[3] = &gameState.heroes[3];
+		gameState.partySize = 4;
 
 		GameConfig gameConfig;
 		gameConfig.state = &gameState;
@@ -279,11 +280,80 @@ int main(int argc, char **argv) {
 		menubg.SetSize(Vector<int>(64, 64));
 		menuResources.menubg = &menubg;
 
-		menuResources.normalFont = gameConfig.battleResources->normalFont;
+		menuResources.statusFont = gameConfig.battleResources->normalFont;
 
 		graphics::Sprite statusLabels(IMG_Load("test-data/status-labels.png"), 32, 16);
 		menuResources.statusLabels = &statusLabels;
 
+		graphics::Frame statusFrame(IMG_Load("test-data/status-frame.png"), 32, 32, 32, 32);
+		menuResources.statusFrame = &statusFrame;
+
+		graphics::Sprite menuFontSprite(IMG_Load("test-data/menu-font.png"), 16, 16);
+		graphics::Font menuFont(&menuFontSprite, 0, -2);
+
+		menuResources.normalFont = &menuFont;
+
+		graphics::Sprite menuCursor(IMG_Load("test-data/menu-cursor.png"), 32, 16);
+
+		graphics::MenuProperties mainMenuProperties;
+		mainMenuProperties.cols = 2;
+		mainMenuProperties.rows = 4;
+		mainMenuProperties.charsPerEntry = 8;
+		mainMenuProperties.rowGap = 8;
+		mainMenuProperties.colGap = 32;
+		mainMenuProperties.cursor = &menuCursor;
+		mainMenuProperties.font = &menuFont;
+		mainMenuProperties.wrapX = true;
+		mainMenuProperties.wrapY = true;
+		menuResources.mainMenuProperties = &mainMenuProperties;
+
+		menuResources.mainMenuItemText = "ITEM";
+		menuResources.mainMenuSpellText = "SPELL";
+		menuResources.mainMenuCapsuleText = "CAPSULE";
+		menuResources.mainMenuEquipmentText = "EQUIP";
+		menuResources.mainMenuStatusText = "STATUS";
+		menuResources.mainMenuChangeText = "CHANGE";
+		menuResources.mainMenuConfigText = "CONFIG";
+		menuResources.mainMenuScenarioText = "SCENARIO";
+
+		menuResources.mainMenuTimeText = "TIME";
+		menuResources.mainMenuGoldText = "GOLD";
+
+		graphics::Sprite heroCursor(IMG_Load("test-data/hero-cursor.png"), 64, 16);
+		menuResources.heroCursor = &heroCursor;
+		menuResources.heroCursorBlinkTime = 532;
+
+		menuResources.noEquipmentText = "No equip";
+
+		graphics::Sprite shoulderNav(IMG_Load("test-data/shoulder-nav.png"), 160, 16);
+		menuResources.shoulderNav = &shoulderNav;
+
+		menuResources.atpLabel = "ATP";
+		menuResources.dfpLabel = "DFP";
+		menuResources.strLabel = "STR";
+		menuResources.aglLabel = "AGL";
+		menuResources.intLabel = "INT";
+		menuResources.gutLabel = "GUT";
+		menuResources.mgrLabel = "MGR";
+
+		menuResources.ipLabel = "IP";
+		menuResources.experienceLabel = "NOW EXP";
+		menuResources.nextLevelLabel = "NEXT LEVEL";
+
+		graphics::MenuProperties statusMenuProperties;
+		statusMenuProperties.cols = 2;
+		statusMenuProperties.rows = 1;
+		statusMenuProperties.charsPerEntry = 6;
+		statusMenuProperties.rowGap = 0;
+		statusMenuProperties.colGap = 16;
+		statusMenuProperties.cursor = &menuCursor;
+		statusMenuProperties.font = &menuFont;
+		statusMenuProperties.wrapX = true;
+		menuResources.statusMenuProperties = &statusMenuProperties;
+
+		menuResources.nextLabel = "NEXT";
+		menuResources.returnLabel = "RETURN";
+
 		InitScreen screen(width, height);
 
 		app::State *state(0);