X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fmain.cpp;h=075ce1e0bb5861e534bfedb722768a3ea18f502a;hb=15b018d9915412a341e2064760fc915fc5bdbade;hp=73b42740180cc7f5727fe506da1847bdc3a5422f;hpb=e4f678d8cce5408590178bc873fde1754c037d0d;p=l2e.git diff --git a/src/main.cpp b/src/main.cpp index 73b4274..075ce1e 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; @@ -279,6 +279,14 @@ int main(int argc, char **argv) { menubg.SetSize(Vector(64, 64)); menuResources.menubg = &menubg; + menuResources.normalFont = 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; + InitScreen screen(width, height); app::State *state(0);