]> code.bitgloo.com Git - clyne/gamedev.git/commitdiff
Worlds can be themed
authordrumsetmonkey <abelleisle@roadrunner.com>
Thu, 11 Feb 2016 13:28:27 +0000 (08:28 -0500)
committerdrumsetmonkey <abelleisle@roadrunner.com>
Thu, 11 Feb 2016 13:28:27 +0000 (08:28 -0500)
1  2 
src/entities.cpp
src/ui.cpp
xml/playerSpawnHill1.xml

Simple merge
diff --cc src/ui.cpp
index ead493226d95675bd33a6746e8f90ca16ca6f3b8,7c7319294f4d98ca7036388d14b76ed58badb6c8..e6ee98815ae80495d7992b9c287b9d6a7cdd3496
@@@ -727,7 -728,8 +730,7 @@@ namespace ui 
        */
  
        void drawMenu(Menu *menu){
-               setFontSize(18);
 -
+               setFontSize(24);
                SDL_Event e;
                        
                mouse.x=premouse.x+offset.x-(SCREEN_WIDTH/2);
index a99b274120b110ae5cb22bec79dc97782bae1700,3bd0095dc71418a4d03a92229d6965bf08626135..c5e736b960df556e200c785357dc466b29475940
@@@ -24,20 -22,22 +21,27 @@@ And it wasn't stormy
  
  <Dialog name="Ralph">
        
-       <text id="0">
-               Hello there!
-               <option text="Hello" nextid="1" />
-               <option text="Frig" nextid="2" />
+       <text id="0" nextid="1" >
+               Hello there! My name is Ralph.
        </text>
        
-       <text id="1">
-               gg.
+       <text id="1" nextid="2" call="Johnny" callid="0" pause="true" >
+               You should go talk to my friend Johnny. He's a pretty chill dude.
        </text>
        
++<<<<<<< HEAD
 +      <text id="2" call="Johnny" callid="1">
 +              what you have done it to trick Microsoft?
++=======
+       <text id="2" >
+               Niice.
+               <quest check="Your First Quest" fail="3" />
++>>>>>>> 3033594b89f23e65b6152daa6610f991307f2f67
        </text>
        
+       <text id="3">
+               Go check out Johnny. He's cool.
+       </text>
  </Dialog>
  
  <Dialog name="Johnny">