modified: src/eng_core.cpp

	deleted:    src/eng_core.cpp.1
	modified:   src/eng_core.h
	deleted:    src/eng_core.h.1
	src/eng_core.cpp.0
	src/eng_core.h.0

diff --git a/src/eng_core.cpp b/src/eng_core.cpp
index 8f790fac2bf23742a423a8a6e424d4c7154eb3f3..2bfb4ca153c7cb0e4a053d8a3c2c331b8475fb6b 100644 (file)
--- a/src/eng_core.cpp
+++ b/src/eng_core.cpp
@@ -1,5 +1,5 @@
 #include "src\eng_core.h"\r
-#include <list>\r
+\r
 #include "src\eng_snd.h"\r
 #include "src\eng_gfx.h"\r
 #include "src\eng_comm.h"\r
@@ -19,35 +19,35 @@ namespace engine{
                this->init();\r
                \r
                //default constructor\r
-               this->fp = new std::list<void(Core::*)()>;\r
                this->msg = ENGINE_RUN;\r
                this->timer.start_timer();\r
                this->frames_per_second = 60;\r
 \r
-               this->fp->push_back(&Core::sound);\r
-               this->fp->push_back(&Core::graphics);\r
-               this->fp->push_back(&Core::comm);\r
-               this->fp->push_back(&Core::ai);\r
-\r
-               //this->fp.push_back(&core::sound);\r
-               //this->fp.push_back(&core::graphics);\r
-               //this->fp.push_back(&core::comm);\r
-               //this->fp.push_back(&engine::core::ai);\r
-\r
                // Global Variables\r
                this->bing = 4; // test global variable\r
                this->x = 0; // X\r
                this->y = 0; // Y\r
+               \r
+               // Start setttings of flags.  I hope I got the same\r
+               // logic as it was before, with the STL list.\r
+               this->graphics_flag = true;\r
+               this->comm_flag = true;\r
+               this->release_flag = false;\r
        }\r
 \r
        void Core::update()\r
        {\r
-               for (std::list<void(Core::*)()>::iterator i = fp->begin(); i != fp->end(); i++)\r
-               //for (std::list<void(core::*)()>::iterator i = this->fp.begin(); i != this->fp.end(); i++)\r
-               {\r
-                       (this->*(*i))();\r
-               }\r
-\r
+         // call update functions, instead of traversing a function pointer\r
+         // list.  Remove this comment!\r
+\r
+         sound();\r
+         if ( graphics_flag )\r
+                 graphics();\r
+         if ( comm_flag )\r
+                 comm();\r
+         ai();\r
+         if ( release_flag )\r
+                 release();\r
        }\r
 \r
        void Core::sound()\r
@@ -165,32 +165,31 @@ namespace engine{
                if (this->timer.elapsed_timer() >= (1.0 / this->frames_per_second))\r
                {\r
                        //int a;std::cin >> a;\r
-                       this->fp->push_back(&Core::graphics);\r
+                       graphics_flag = true;\r
                        this->timer.start_timer();\r
 //====                 std::cout << "GRAPHICS GRAPHICS GRAPHICS GRAPHICS GRAPHICS" << std::endl;\r
                }\r
                else\r
                {\r
-                       this->fp->remove(&Core::graphics);\r
+                       graphics_flag = false;\r
                }\r
                if (ENGINE_INPUT == this->msg)\r
                {\r
-                       this->fp->push_back(&Core::comm);\r
+                       comm_flag = true;\r
                }\r
                else\r
                {\r
-                       this->fp->remove(&Core::comm);\r
+                       comm_flag = false;\r
                }\r
                if (ENGINE_QUIT == this->msg)\r
                {\r
-                       this->fp->push_back(&Core::release);\r
+                       release_flag = true;\r
                }\r
        }\r
 \r
        Core::~Core()\r
        {\r
                //deconstructor\r
-               delete(this->fp);\r
        }\r
 \r
 }\r

diff --git a/src/eng_core.cpp.1 b/src/eng_core.cpp.1
deleted file mode 100644 (file)
index 2bfb4ca..0000000
--- a/src/eng_core.cpp.1
+++ /dev/null
@@ -1,195 +0,0 @@
-#include "src\eng_core.h"\r
-\r
-#include "src\eng_snd.h"\r
-#include "src\eng_gfx.h"\r
-#include "src\eng_comm.h"\r
-#include "src\eng_ai.h"\r
-\r
-#include <iostream>\r
-\r
-//#include "src\lib\dos_gfx.h"\r
-//#include "src\lib\opl2.h"\r
-//#include "src\lib\dos_comm.h"\r
-\r
-namespace engine{\r
-\r
-       Core::Core()\r
-       {\r
-               // Hardware Initiation\r
-               this->init();\r
-               \r
-               //default constructor\r
-               this->msg = ENGINE_RUN;\r
-               this->timer.start_timer();\r
-               this->frames_per_second = 60;\r
-\r
-               // Global Variables\r
-               this->bing = 4; // test global variable\r
-               this->x = 0; // X\r
-               this->y = 0; // Y\r
-               \r
-               // Start setttings of flags.  I hope I got the same\r
-               // logic as it was before, with the STL list.\r
-               this->graphics_flag = true;\r
-               this->comm_flag = true;\r
-               this->release_flag = false;\r
-       }\r
-\r
-       void Core::update()\r
-       {\r
-         // call update functions, instead of traversing a function pointer\r
-         // list.  Remove this comment!\r
-\r
-         sound();\r
-         if ( graphics_flag )\r
-                 graphics();\r
-         if ( comm_flag )\r
-                 comm();\r
-         ai();\r
-         if ( release_flag )\r
-                 release();\r
-       }\r
-\r
-       void Core::sound()\r
-       {\r
-               //wrap sound lib\r
-               do_sound();\r
-       }\r
-       void Core::graphics()\r
-       {\r
-               //int num_frames = 60;\r
-               //double fps = 1.0 / num_frames;\r
-               //double now = this->timer.elapsed_timer();\r
-               //std::cout << "fps: " << fps << "      now: " << now << std::endl;\r
-               //if (this->timer.elapsed_timer() >= fps)\r
-               //{\r
-               //wrap graphics lib\r
-               do_graphics();\r
-               //this->timer.start_timer();\r
-               //}\r
-       }\r
-       void Core::comm()\r
-       {\r
-               //int num_frames = 60;\r
-               //double fps = 1.0 / num_frames;\r
-               //double now = this->timer.elapsed_timer();\r
-               //std::cout << "fps: " << fps << "      now: " << now << std::endl;\r
-               //if (this->timer.elapsed_timer() >= fps)\r
-               //{\r
-               //wrap comm lib\r
-               this->msg = do_communication();\r
-               //this->timer.start_timer();\r
-               //}\r
-       }\r
-       void Core::ai()\r
-       {\r
-               //wrap A.I. lib\r
-               do_artificial_intelligence();\r
-       }\r
-\r
-       engine_message Core::_msg()\r
-       {\r
-               return this->msg;\r
-       }\r
-\r
-       void Core::run()\r
-       {\r
-//----         int i = 0;\r
-               while (ENGINE_EXIT != this->msg)\r
-               {\r
-                       //next line for purely testing purposes\r
-//----                 i++;if(i==600){char a;std::cin >> a;this->keeq[a] = true;i=0;}\r
-                       this->sync();\r
-                       this->input();\r
-                       this->update();\r
-               }\r
-       }\r
-\r
-       bool Core::init(){\r
-               bool xz = 0; // error switch...\r
-               std::cout << "VIDEO INITIATION" << std::endl;\r
-               setvideo(0x13, 1);\r
-               setvbuff(1);\r
-               std::cout << "Checking for Adlib sound card...." << std::endl;\r
-               if(!AdlibExists()){\r
-                       std::cout << "not found." << std::endl;\r
-                       xz = 1;\r
-               }\r
-               std::cout << "found." << std::endl;\r
-               std::cout << "OPL2 INITIATION" << std::endl;\r
-               fmtest();\r
-               std::cout << "\nPress ESC to quit the game engine core test." << std::endl;\r
-               std::cout << "1 - 9 for graphical tests!" << std::endl;\r
-               std::cout << "space bar for control and sprite test!" << std::endl;\r
-               std::cout << "z key for noise!" << std::endl;\r
-               std::cout << "Press press any key to continue!" << std::endl;\r
-               getch();\r
-               std::cout << "INPUT INITIATION" << std::endl;\r
-               setkb(1);\r
-               std::cout << "INITIATION" << std::endl;\r
-               return xz;\r
-       }\r
-\r
-       void Core::release()\r
-       {\r
-               //release contexts and set engine to exit\r
-               setvideo(0x03, 0);\r
-               setvbuff(0);\r
-               setkb(0);\r
-               FMReset();\r
-               this->msg = ENGINE_EXIT;\r
-       }\r
-\r
-       void Core::input(){\r
-               //retrieve input device information\r
-               //dummy 'w' and 'p' down, t up\r
-//----         bool dummy_input_available = true;\r
-//----         if(dummy_input_available)\r
-//----         {\r
-//----                 std::cout << "key down" << std::endl;\r
-//----                 this->keeq['w'] = true;\r
-//----                 this->keeq['p'] = true;\r
-//----                 this->keeq['t'] = false;\r
-                       //notify engine that input occured\r
-                       this->msg = ENGINE_INPUT;\r
-//----         }\r
-//----         else\r
-//----         {\r
-//----                 std::cout << "key up" << std::endl;\r
-//----                 this->msg = ENGINE_RUN;\r
-//----         }\r
-       }\r
-\r
-       void Core::sync()\r
-       {\r
-               if (this->timer.elapsed_timer() >= (1.0 / this->frames_per_second))\r
-               {\r
-                       //int a;std::cin >> a;\r
-                       graphics_flag = true;\r
-                       this->timer.start_timer();\r
-//====                 std::cout << "GRAPHICS GRAPHICS GRAPHICS GRAPHICS GRAPHICS" << std::endl;\r
-               }\r
-               else\r
-               {\r
-                       graphics_flag = false;\r
-               }\r
-               if (ENGINE_INPUT == this->msg)\r
-               {\r
-                       comm_flag = true;\r
-               }\r
-               else\r
-               {\r
-                       comm_flag = false;\r
-               }\r
-               if (ENGINE_QUIT == this->msg)\r
-               {\r
-                       release_flag = true;\r
-               }\r
-       }\r
-\r
-       Core::~Core()\r
-       {\r
-               //deconstructor\r
-       }\r
-\r
-}\r

diff --git a/src/eng_core.h b/src/eng_core.h
index 996ffa06a00a617678314edbab0381df71be3f44..e19529b107c31620711d5d516f4d2067c2a67ae6 100644 (file)
--- a/src/eng_core.h
+++ b/src/eng_core.h
@@ -1,14 +1,13 @@
 #ifndef _ENGINE_CORE_H_\r
 #define _ENGINE_CORE_H_\r
 \r
-#include <list>\r
 #include "src\engine.h"\r
 #include "src\timer.h"\r
 \r
 namespace engine {\r
        class Core\r
        {\r
-       public:
+       public:\r
                Core();\r
                void update();\r
                void sound();\r
@@ -26,17 +25,19 @@ namespace engine {
        protected:\r
        private:\r
                engine_message msg;\r
-               std::list<void(Core::*)()> *fp;\r
-               Timer timer;
-//             unsigned char key[256];
+               Timer timer;\r
+//             unsigned char key[256];\r
                int frames_per_second;\r
-               //std::list<void(core::*)()> fp;
+               //std::list<void(core::*)()> fp;\r
 /*             int xxxx = 0;\r
                int yyyy = 0;*/\r
-               int bing;
-               int x;
+               int bing;\r
+               int x;\r
                int y;\r
+\r
+               // Because we removed the function pointer STL list:\r
+               bool graphics_flag, comm_flag, release_flag;\r
        };\r
 }\r
 \r
-#endif/*_ENGINE_CORE_H_*/
\ No newline at end of file
+#endif/*_ENGINE_CORE_H_*/\r

diff --git a/src/eng_core.h.1 b/src/eng_core.h.1
deleted file mode 100644 (file)
index e19529b..0000000
--- a/src/eng_core.h.1
+++ /dev/null
@@ -1,43 +0,0 @@
-#ifndef _ENGINE_CORE_H_\r
-#define _ENGINE_CORE_H_\r
-\r
-#include "src\engine.h"\r
-#include "src\timer.h"\r
-\r
-namespace engine {\r
-       class Core\r
-       {\r
-       public:\r
-               Core();\r
-               void update();\r
-               void sound();\r
-               void graphics();\r
-               void comm();\r
-               void ai();\r
-               engine_message _msg();\r
-               void run();\r
-               bool init();\r
-               void release();\r
-               void input();\r
-               void sync();\r
-               ~Core();\r
-\r
-       protected:\r
-       private:\r
-               engine_message msg;\r
-               Timer timer;\r
-//             unsigned char key[256];\r
-               int frames_per_second;\r
-               //std::list<void(core::*)()> fp;\r
-/*             int xxxx = 0;\r
-               int yyyy = 0;*/\r
-               int bing;\r
-               int x;\r
-               int y;\r
-\r
-               // Because we removed the function pointer STL list:\r
-               bool graphics_flag, comm_flag, release_flag;\r
-       };\r
-}\r
-\r
-#endif/*_ENGINE_CORE_H_*/\r