X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fcarfire;a=blobdiff_plain;f=CarFire%2FCarFire%2FCarFire%2FDisplay.cs;h=ed848fa31d07596d970b868cf8c55336765e1102;hp=c65075f3fb3a2209d6364ab00d69ad7bbc656214;hb=236bc590ff21370c1139a8c01ff35f7b30af743d;hpb=8e3efc188caf3e6c4132e9291fcc2ba1e9213293
diff --git a/CarFire/CarFire/CarFire/Display.cs b/CarFire/CarFire/CarFire/Display.cs
index c65075f..ed848fa 100644
--- a/CarFire/CarFire/CarFire/Display.cs
+++ b/CarFire/CarFire/CarFire/Display.cs
@@ -1,4 +1,10 @@
-using System;
+#undef SINGLE_TEST
+
+// Define INGAME_ZOOM to allow zooming in and out with
+// the PageUp and PageDown keys.
+#define INGAME_ZOOM
+
+using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
@@ -9,13 +15,24 @@ using Microsoft.Xna.Framework.Input;
namespace CarFire
{
+ ///
+ /// This class is responsible for controlling what draws to the screen when the game is running.
+ ///
public class Display
{
- List mProjectiles = new List();
- List mCharacters = new List();
- Map mMap;
- public Display()
+ Texture2D everything;
+ Texture2D projectile1;
+ Game mGame;
+ GameLogic mGameLogic;
+ HUD theHUD;
+#if SINGLE_TEST
+ List mLastPressedKeys = new List();
+#endif
+ public Display(Game game)
{
+ mGame = game;
+ mGameLogic = new GameLogic(game);
+ theHUD = new HUD(game);
/*
mMap = aMap;
mCharacters = characters;
@@ -28,13 +45,9 @@ namespace CarFire
///
public void LoadContent(ContentManager contentManager)
{
- Texture2D everything = contentManager.Load("cs");
- mMap = contentManager.Load