From e6ba365d8f4b261687d4947d6b78f08c7fda1cdb Mon Sep 17 00:00:00 2001 From: Daniel Karbach Date: Fri, 5 Oct 2012 18:27:27 +0200 Subject: [PATCH] added monster dummy --- src/main.cpp | 14 ++++++++++++++ test-data/monster-map.png | Bin 0 -> 1355 bytes 2 files changed, 14 insertions(+) create mode 100644 test-data/monster-map.png diff --git a/src/main.cpp b/src/main.cpp index d92e294..c1b70af 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -364,6 +364,14 @@ int main(int argc, char **argv) { mapDekar.SpriteOffset() = Vector(0, -32); mapGuy.AddFollower(&mapDekar); + SDL_Surface *mapMonsterImg(IMG_Load("test-data/monster-map.png")); + Sprite mapMonsterSprite(mapMonsterImg, 32, 32); + SimpleAnimation mapMonsterAnimation(&mapMonsterSprite, 500, 2, 0, 0, true); + Entity mapMonster; + mapMonster.SetAnimation(&mapMonsterAnimation); + mapMonster.Position() = Vector(64, 32); + mapMonster.SetOrientation(Entity::ORIENTATION_SOUTH); + InitScreen screen(width, height); app::State *state(0); @@ -381,12 +389,18 @@ int main(int argc, char **argv) { state = battleState; } else { MapState *mapState(new MapState(&map)); + mapState->AddEntity(&mapMaxim); mapState->AddEntity(&mapSelan); mapState->AddEntity(&mapGuy); mapState->AddEntity(&mapDekar); + mapState->ControlEntity(&mapMaxim); mapState->SetWalkingSpeed(walkSpeed); + + mapState->AddEntity(&mapMonster); + mapMonster.StartAnimation(*mapState); + state = mapState; } diff --git a/test-data/monster-map.png b/test-data/monster-map.png new file mode 100644 index 0000000000000000000000000000000000000000..dab3123ec752279479f2028814062b97d9451b0f GIT binary patch literal 1355 zcmV-R1+@B!P); z5qW)meYoX(EZk~d*WOn$02$!6nt>8Jng0?Ik<-!rzYE99Js;s|> zz~-ssqvoUL9a@GF+`J{! zIQ11unJ1dB+kf?ma_f&637FLTGO{595FZ!-ZI4Qxmmu#&N>cLBR<75}z&9xMW_6s& zJhbI{9VH(bWG(xo*RHnDGaE1g&d>V}v&!|Ot#yoKMKh@R$Yi>YdcAc0>g`+eR*(V4 z9tC9c?%@5Z4MfSeY!7Gp(2B*=M#Oi0X<>!3Csn-^ow$_kjjlXsN?eh}i z=t|8;=0J^tbbwy>w)-Wt-5ST|d<4uRU=)zs2mL?pgT=sPfU)}km_6usYU=BZG_ zFb`m5Acsa1IB)e~a^oY@VLXrCxv8OI@6Zhm+!U@WB@Wi87zssm$PxTu-;viYUaJ{3mJeQ2!bF8 zf*=TjAP9mW2;#rTx64;wySn$@#{cT|@Lj;jar6EF_}u6uOgpSo$k4j_=+v{TAS%VR z7~@hV%B_bdf{0;0fK|on&&5}sgvr&$`BS-tCyx|XpMX*(z`A^_gE0F9TLt@B z!F_CH7tVV+tn1miKY|QeKh|mZ{eZ8N0muOT8n3olCF^{>zg`_B5<7^XCSbL(rD=E{ zj;}UTD`IdSmL^&?l2{jzTR(O=L!Us$vBtMF-ReVt*YSJE2zWmkVC+#qt}9mLT~5>9 zv1x+}D_JbxBC?In+m7aCoX^L37FQ|H3g`WMSS_QqetZtDqjn!mUyEJBh;$TyJ$|60 zgjTQmYS%@-jVc97y4TQ5-Tc{W4mDEm+djHlKDQ3PF4^>IzSWnY)HkUG<{5kq;&JQd zF)560(tQvxFG3%HNHYL-qOfctR>h)ZMGT^_>if6-ajzfen0`(q;VSvAiq~r{L^Bpp z^RX(}%3pZqP{!)YGMK)Pg7!nyak`KpbNw4I3X1X~9rFOh$0)#xgDtN#XTvcAX63ST zad?!=FN`Y84kMN0TTwuiQ%9SP-N?{pcXjI@8oiY6KN)}wVEB?oW-8Z{*3!^R-{)V7 zOY8FS?VQDYx_+y_z^(cNSmTlb$N<-s#If`X$gTfg&K8mZ2!bF+i+@O5xUSr9*NgxF N002ovPDHLkV1ns5sp0?t literal 0 HcmV?d00001 -- 2.39.2