Merge branch 'master' of https://github.com/GreenLightning/game-programming-patterns

Conflicts:
	book/prototype.markdown

Author: munificent

book/prototype.markdown

@@ -17,7 +17,7 @@ Watch [the demo](http://www.youtube.com/watch?v=USyoT_Ha_bA) and prepare to be b
 
 Pretend we're making a game in the style of Gauntlet. We've got creatures and fiends swarming around the hero, vying for their share of his flesh. These unsavory dinner companions enter the arena by way of generators, and there is a different generator for each kind of enemy.
 
-For the sake of this example, let's say we have different types for each kind of monster in the game. We'll have actual C++ classes for `Ghost`, `Demon`, `Sorceror`, etc.:
+For the sake of this example, let's say we have different types for each kind of monster in the game. We'll have actual C++ classes for `Ghost`, `Demon`, `Sorcerer`, etc., like:
 
 ^code monster-classes
 

book/update-method.markdown

@@ -7,7 +7,7 @@
 
 ## Motivation
 
-The player's mighty valkyrie is on a quest to steal glorious jewels from where they rest on the bones of the long-dead sorceror-king. She tentatively approaches the entrance of his magnificent crypt and is attacked by... *nothing*. No cursed statues shooting lightning at her. No undead warriors patrolling the entrance. She just walks right in grabs the loot. <span name="win">Game over.</span> You win.
+The player's mighty valkyrie is on a quest to steal glorious jewels from where they rest on the bones of the long-dead sorcerer-king. She tentatively approaches the entrance of his magnificent crypt and is attacked by... *nothing*. No cursed statues shooting lightning at her. No undead warriors patrolling the entrance. She just walks right in grabs the loot. <span name="win">Game over.</span> You win.
 
 Well, that won't do.
 
@@ -21,7 +21,7 @@ This crypt needs some guards -- some enemies our brave hero can grapple with. Fi
 
 <aside name="brains">
 
-If the sorceror-king wanted more intelligent behavior, he should have re-animated something that still had brain tissue.
+If the sorcerer-king wanted more intelligent behavior, he should have re-animated something that still had brain tissue.
 
 </aside>
 

code/cpp/prototype.h

@@ -13,7 +13,7 @@ namespace PrototypePattern
 
     class Ghost : public Monster {};
     class Demon : public Monster {};
-    class Sorceror : public Monster {};
+    class Sorcerer : public Monster {};
     //^monster-classes
 
     //^generator-classes

draft/first draft/update-method.markdown

@@ -7,9 +7,9 @@
 
 ## Motivation
 
-The player's mighty warrior is on a quest to steal the glorious jewels from where they rest on the bones of the long-dead sorceror-queen. He walks to the entrance of her magnificent crypt to discover... nothing. No cursed statues shooting lightning at him. No undead warriors guarding the entrance. He can just walk right in that grab the loot. That won't do.
+The player's mighty warrior is on a quest to steal the glorious jewels from where they rest on the bones of the long-dead sorcerer-queen. He walks to the entrance of her magnificent crypt to discover... nothing. No cursed statues shooting lightning at him. No undead warriors guarding the entrance. He can just walk right in that grab the loot. That won't do.
 
-This crypt needs some protection: some enemies our brave hero can grapple with. First up, we want a re-animated skeleton guard to patrol back and forth in front of the door. (If the sorceror-queen wanted more intelligent behavior, she should have re-animated something that still had brains.)
+This crypt needs some protection: some enemies our brave hero can grapple with. First up, we want a re-animated skeleton guard to patrol back and forth in front of the door. (If the sorcerer-queen wanted more intelligent behavior, she should have re-animated something that still had brains.)
 
 Our actual game deals with user input, rendering, and maintaining a stable framerate. That means all of the game code is nestled within a comfy little <a href="game-loop.html" class="pattern">game loop</a>. If we ignore that for the moment and imagine the simplest possible code to move our skeleton back and forth, we'd have something like:
 

html/prototype.html

@@ -71,15 +71,15 @@ <h2><a href="#the-prototype-design-pattern" name="the-prototype-design-pattern">
 </aside>
 
 <p>Pretend we&#x2019;re making a game in the style of Gauntlet. We&#x2019;ve got creatures and fiends swarming around the hero, vying for their share of his flesh. These unsavory dinner companions enter the arena by way of generators, and there is a different generator for each kind of enemy.</p>
-<p>For the sake of this example, let&#x2019;s say we have different types for each kind of monster in the game. We&#x2019;ll have actual C++ classes for <code>Ghost</code>, <code>Demon</code>, <code>Sorceror</code>, etc.:</p>
+<p>For the sake of this example, let&#x2019;s say we have different types for each kind of monster in the game. We&#x2019;ll have actual C++ classes for <code>Ghost</code>, <code>Demon</code>, <code>Sorcerer</code>, etc., like:</p>
 <div class="codehilite"><pre><span class="k">class</span> <span class="nc">Monster</span>
 <span class="p">{</span>
   <span class="c1">// Stuff...</span>
 <span class="p">};</span>
 
 <span class="k">class</span> <span class="nc">Ghost</span> <span class="o">:</span> <span class="k">public</span> <span class="n">Monster</span> <span class="p">{};</span>
 <span class="k">class</span> <span class="nc">Demon</span> <span class="o">:</span> <span class="k">public</span> <span class="n">Monster</span> <span class="p">{};</span>
-<span class="k">class</span> <span class="nc">Sorceror</span> <span class="o">:</span> <span class="k">public</span> <span class="n">Monster</span> <span class="p">{};</span>
+<span class="k">class</span> <span class="nc">Sorcerer</span> <span class="o">:</span> <span class="k">public</span> <span class="n">Monster</span> <span class="p">{};</span>
 </pre></div>
 
 

html/update-method.html

@@ -64,7 +64,7 @@ <h1>Update Method</h1>
 <h2><a href="#intent" name="intent">Intent</a></h2>
 <p><em>Simulate a collection of independent objects by telling each to process one frame of behavior at a time.</em></p>
 <h2><a href="#motivation" name="motivation">Motivation</a></h2>
-<p>The player&#x2019;s mighty valkyrie is on a quest to steal glorious jewels from where they rest on the bones of the long-dead sorceror-king. She tentatively approaches the entrance of his magnificent crypt and is attacked by&hellip; <em>nothing</em>. No cursed statues shooting lightning at her. No undead warriors patrolling the entrance. She just walks right in grabs the loot. <span name="win">Game over.</span> You win.</p>
+<p>The player&#x2019;s mighty valkyrie is on a quest to steal glorious jewels from where they rest on the bones of the long-dead sorcerer-king. She tentatively approaches the entrance of his magnificent crypt and is attacked by&hellip; <em>nothing</em>. No cursed statues shooting lightning at her. No undead warriors patrolling the entrance. She just walks right in grabs the loot. <span name="win">Game over.</span> You win.</p>
 <p>Well, that won&#x2019;t do.</p>
 <aside name="win">
 
@@ -74,7 +74,7 @@ <h2><a href="#motivation" name="motivation">Motivation</a></h2>
 <p>This crypt needs some guards&thinsp;&mdash;&thinsp;some enemies our brave hero can grapple with. First up, we want a re-animated <span name="brains">skeleton guard</span> to patrol back and forth in front of the door.</p>
 <aside name="brains">
 
-<p>If the sorceror-king wanted more intelligent behavior, he should have re-animated something that still had brain tissue.</p>
+<p>If the sorcerer-king wanted more intelligent behavior, he should have re-animated something that still had brain tissue.</p>
 </aside>
 
 <p>Ignoring everything you probably already know about game programming, the simplest possible code to make that skeleton lurch back and forth is something like:</p>