Changeset 2058 in orxonox.OLD for orxonox/branches/chris/src/npc.cc

Timestamp:

Jul 2, 2004, 11:36:56 AM (20 years ago)

Author:

chris

Message:

orxonox/branches/chris: Trunk remerged into my branch started on SDL reconfiguration

File:

• orxonox/branches/chris/src/npc.cc (modified) (4 diffs)

orxonox/branches/chris/src/npc.cc

@@ -16 +16 @@
 */
 
+#include <iostream>
+#include <GL/glut.h>
+
+#include "ai.h"
+#include "data_tank.h"
 
 #include "npc.h"
-
-#include <iostream>
-
 
 using namespace std;
 
 
-NPC::NPC () 
+NPC::NPC()
+  : WorldEntity()
 {
   hasDied = 0;
@@ -57 +60 @@
 
 void NPC::addAI(AI* ai)
+{}
+
+void NPC::paint()
 {
-
-}
-
-void NPC::drawNPC(void) 
-{
+  //cout << "WorldEntity::WorldEntity();" << endl;  
   /* fix: died flag approach is very stupid, just to show @ convention */
   if( hasDied == 0 ) {
@@ -73 +75 @@
 }
 
+void NPC::drawNPC() 
+{
+
+}
+
 
 /* define the reaction, if the ship is been hit */
@@ -81 +88 @@
 }
 
+
 void NPC::die()
 {