From: drumsetmonkey <abelleisle@roadrunner.com>
Date: Thu, 11 Feb 2016 13:28:27 +0000 (-0500)
Subject: Worlds can be themed
X-Git-Url: https://code.bitgloo.com/?a=commitdiff_plain;h=2a4a514b654ef0e08134a116c658d49a8f16cfe7;p=clyne%2Fgamedev.git

Worlds can be themed
---

2a4a514b654ef0e08134a116c658d49a8f16cfe7
diff --cc src/ui.cpp
index ead4932,7c73192..e6ee988
--- a/src/ui.cpp
+++ b/src/ui.cpp
@@@ -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);
diff --cc xml/playerSpawnHill1.xml
index a99b274,3bd0095..c5e736b
--- a/xml/playerSpawnHill1.xml
+++ b/xml/playerSpawnHill1.xml
@@@ -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">