namc-developer — For talks with and between the developers

[Namc-developer] newengine command.cpp,1.11,1.12 localPlayer.cpp,1.11,1.12 localPlayer.h,1.5,1.6 rendertext.cpp,1.6,1.7 worldsheet.cpp,1.9,1.10

[Matthew <rog...@us...>]

Update of /cvsroot/namc/newengine
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7834

Modified Files:
	command.cpp localPlayer.cpp localPlayer.h rendertext.cpp 
	worldsheet.cpp 
Log Message:
commented a large bulk of now unnecessary cout's


Index: localPlayer.cpp
===================================================================
RCS file: /cvsroot/namc/newengine/localPlayer.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** localPlayer.cpp	12 Dec 2005 01:32:33 -0000	1.11
--- localPlayer.cpp	12 Dec 2005 01:50:04 -0000	1.12
***************
*** 576,580 ****
  void localPlayer::keymap(std::vector<std::string *> *d)// {{{
  {
! 	std::cout << "keymap called " << atoi(d->at(1)->c_str()) << " :2: " << d->at(2)->c_str() << std::endl;
  	std::vector<std::string *>::iterator iter = d->begin();
  	std::string key;
--- 576,580 ----
  void localPlayer::keymap(std::vector<std::string *> *d)// {{{
  {
! //	std::cout << "keymap called " << atoi(d->at(1)->c_str()) << " :2: " << d->at(2)->c_str() << std::endl;
  	std::vector<std::string *>::iterator iter = d->begin();
  	std::string key;

Index: localPlayer.h
===================================================================
RCS file: /cvsroot/namc/newengine/localPlayer.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** localPlayer.h	14 Oct 2005 02:52:17 -0000	1.5
--- localPlayer.h	12 Dec 2005 01:50:04 -0000	1.6
***************
*** 28,32 ****
  		int alreadybright;
  		void addaCommand(TFunctor *fun, char *name, int args){
! 			std::cout << "Command Added\n";
  			addCommand(fun, name, args);
  		}
--- 28,32 ----
  		int alreadybright;
  		void addaCommand(TFunctor *fun, char *name, int args){
! //			std::cout << "Command Added\n";
  			addCommand(fun, name, args);
  		}

Index: rendertext.cpp
===================================================================
RCS file: /cvsroot/namc/newengine/rendertext.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** rendertext.cpp	12 Dec 2005 01:11:17 -0000	1.6
--- rendertext.cpp	12 Dec 2005 01:50:04 -0000	1.7
***************
*** 531,545 ****
  //    mi.text = newstring(text);
  //    mi.action = action[0] ? newstring(action) : mi.text;
! 	std::cout << "Menuitem called: \n" ;
  	mitem *m = new mitem();
  	if(text != NULL) {
! 	std::cout <<  "Text: " << text << std::endl;
  	m->text.append(text);
  	}
  	if(action != NULL) {
! 	std::cout << "Action: " << action;
  	m->action.append(action);
  	}
! 	std::cout << std::endl;
  	menus.at(menus.size()-1)->items.push_back(m); //add to the last
  	//menu made with newmenu
--- 531,545 ----
  //    mi.text = newstring(text);
  //    mi.action = action[0] ? newstring(action) : mi.text;
! //	std::cout << "Menuitem called: \n" ;
  	mitem *m = new mitem();
  	if(text != NULL) {
! //	std::cout <<  "Text: " << text << std::endl;
  	m->text.append(text);
  	}
  	if(action != NULL) {
! //	std::cout << "Action: " << action;
  	m->action.append(action);
  	}
! //	std::cout << std::endl;
  	menus.at(menus.size()-1)->items.push_back(m); //add to the last
  	//menu made with newmenu

Index: worldsheet.cpp
===================================================================
RCS file: /cvsroot/namc/newengine/worldsheet.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** worldsheet.cpp	5 Nov 2005 07:18:55 -0000	1.9
--- worldsheet.cpp	12 Dec 2005 01:50:04 -0000	1.10
***************
*** 81,85 ****
   //only add and delete objects by pointers for safety.
  bool world::addObject(object *ptr, char * mdlname = "NULL") {
! 	std::cout << "Adding " << ptr->getName() << " to world!\n";
  	std::string name2add = ptr->getName();
  	float defaultGrav = 0;
--- 81,85 ----
   //only add and delete objects by pointers for safety.
  bool world::addObject(object *ptr, char * mdlname = "NULL") {
! //	std::cout << "Adding " << ptr->getName() << " to world!\n";
  	std::string name2add = ptr->getName();
  	float defaultGrav = 0;
***************
*** 112,116 ****
  bool world::addObject(object *ptr_in, char * name, float x_in, float y_in, float z_in) {
  
!         std::cout << "Adding " << name << " to world!\n";
  //	object *newptr;
  	std::string name2add = name;
--- 112,116 ----
  bool world::addObject(object *ptr_in, char * name, float x_in, float y_in, float z_in) {
  
! //        std::cout << "Adding " << name << " to world!\n";
  //	object *newptr;
  	std::string name2add = name;
***************
*** 719,723 ****
  bool world::installtex(int tnum, char *texname, int &xs, int &ys, bool clamp = false)
  {
! 	std::cout << "Installtex: " << texname << " " << tnum << "\n";
      SDL_Surface *s = IMG_Load(texname);
      if(!s) { std::cout << "couldn't load texture " << texname << "\n"; return false; };
--- 719,723 ----
  bool world::installtex(int tnum, char *texname, int &xs, int &ys, bool clamp = false)
  {
! //	std::cout << "Installtex: " << texname << " " << tnum << "\n";
      SDL_Surface *s = IMG_Load(texname);
      if(!s) { std::cout << "couldn't load texture " << texname << "\n"; return false; };
***************
*** 764,768 ****
  void world::texture(const char *aframe, const char *name_in)
  {
!     std::cout << "Texture: " << name_in << " Added with frame: " << aframe << "\n";
      int num = curtexnum++, frame = atoi(aframe);
      if(num<0 || num>=MAXTEX || frame<0 || frame>=MAXFRAMES) return;
--- 764,768 ----
  void world::texture(const char *aframe, const char *name_in)
  {
! //    std::cout << "Texture: " << name_in << " Added with frame: " << aframe << "\n";
      int num = curtexnum++, frame = atoi(aframe);
      if(num<0 || num>=MAXTEX || frame<0 || frame>=MAXFRAMES) return;

Index: command.cpp
===================================================================
RCS file: /cvsroot/namc/newengine/command.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** command.cpp	12 Dec 2005 01:11:17 -0000	1.11
--- command.cpp	12 Dec 2005 01:50:04 -0000	1.12
***************
*** 52,56 ****
  // add a command addCommand {{{
  void commandI::addCommand(TFunctor *com, char *name, int args){
! 	std::cout << "Adding command: " << name << " on " << this <<"\n";
  	coms *newOne = new coms(); //hmm
  	newOne->Name = name;
--- 52,56 ----
  // add a command addCommand {{{
  void commandI::addCommand(TFunctor *com, char *name, int args){
! //	std::cout << "Adding command: " << name << " on " << this <<"\n";
  	coms *newOne = new coms(); //hmm
  	newOne->Name = name;
***************
*** 273,277 ****
  	y = incommand->find("//");
  	if(y < std::string::npos) {
! 		std::cout << "Comment\n"; std::cout.flush();
  		unsigned int end = incommand->size() - y;
  		incommand->replace(y, end, "");
--- 273,277 ----
  	y = incommand->find("//");
  	if(y < std::string::npos) {
! //		std::cout << "Comment\n"; std::cout.flush();
  		unsigned int end = incommand->size() - y;
  		incommand->replace(y, end, "");

[Namc-developer] newengine localPlayer.cpp,1.10,1.11

[Matthew <rog...@us...>]

Update of /cvsroot/namc/newengine
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5062

Modified Files:
	localPlayer.cpp 
Log Message:
Fixed console input to not use execCommand when it should use execute()



Index: localPlayer.cpp
===================================================================
RCS file: /cvsroot/namc/newengine/localPlayer.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** localPlayer.cpp	5 Nov 2005 07:18:55 -0000	1.10
--- localPlayer.cpp	12 Dec 2005 01:32:33 -0000	1.11
***************
*** 294,298 ****
  		if(code==SDLK_RETURN && !possess) {
  			char *commandBuf = RText::getComBuf();
! 			execCommand(commandBuf, true);
  		} if(!possess)
  			RText::ConsoleKeyboardI(code, isdown, cooked);
--- 294,298 ----
  		if(code==SDLK_RETURN && !possess) {
  			char *commandBuf = RText::getComBuf();
! 			execute(commandBuf, true);
  		} if(!possess)
  			RText::ConsoleKeyboardI(code, isdown, cooked);

[Namc-developer] newengine setup,NONE,1.1 Makefile.am,1.4,1.5 README,1.2,1.3 command.cpp,1.10,1.11 configure.ac,1.2,1.3 functors.h,1.3,1.4 libtool,1.1.1.1,1.2 music.cpp,1.1,1.2 rendertext.cpp,1.5,1.6 vObject.h,1.5,1.6

[Matthew <rog...@us...>]

Update of /cvsroot/namc/newengine
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1338

Modified Files:
	Makefile.am README command.cpp configure.ac functors.h libtool 
	music.cpp rendertext.cpp vObject.h 
Added Files:
	setup 
Log Message:
Modified functors, removed 2-3 hundred lines from command.cpp
Upgraded configure process to fail when missing a library
Fixed glext.h warning in configure



Index: functors.h
===================================================================
RCS file: /cvsroot/namc/newengine/functors.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** functors.h	14 Oct 2005 02:52:17 -0000	1.3
--- functors.h	12 Dec 2005 01:11:17 -0000	1.4
***************
*** 14,17 ****
--- 14,21 ----
          bool immcmd; //immortal command
          int type;
+ 	class Returns {
+ 		public:
+ 	};
+ 	Returns _return;
  };
  
***************
*** 25,39 ****
  			//behaviors.
  		virtual ~TFunctor(){};
! 		virtual void Call()=0;
! 		virtual void Call(std::string &)=0;        // call using function
! 		virtual void Call(const char *array[])=0;
! 		virtual void Call(const char *)=0;
! 		virtual void Call(const char *, const char *)=0;
! 		virtual void Call(bool *)=0;
! 		virtual void Call(int)=0;
! 		virtual void Call(char)=0;
! 		virtual void Call(std::vector<std::string *> *d)=0;
! 		virtual void Call(std::vector<std::string *> *d, int &sock_in)=0;
! 		virtual void Call(std::string &, int&)=0;
  };
  
--- 29,33 ----
  			//behaviors.
  		virtual ~TFunctor(){};
! virtual void *Call(std::vector<std::string>&d, int &sock_in, bool *isDown)=0;
  };
  
***************
*** 52,144 ****
  		void (TClass::*fpt10)(std::vector<std::string *> *d, int &sock_in);
  		void (TClass::*fpt11)(std::string &, int&);		
                  TClass* pt2Object; // pointer to object
  
          public:
  //no arguements at all.
                  Functor(TClass* _pt2Object, void(TClass::*_fpt)())
!                 { pt2Object = _pt2Object;  fpt1=_fpt;};
  //1 std::string
                  Functor(TClass* _pt2Object, void(TClass::*_fpt)(std::string &))
!                 { pt2Object = _pt2Object;  fpt2=_fpt; };
  //1 c string
  		Functor(TClass* _pt2Object, void(TClass::*_fpt)(const char *))
! 		{ pt2Object = _pt2Object;  fpt3=_fpt;};
                  Functor(TClass* _pt2Object, void(TClass::*_fpt)(const char *array[]))
!                 { pt2Object = _pt2Object; fpt4=_fpt;};
  //2 c strings
                  Functor(TClass* _Obj, void(TClass::*_fpt)(const char *, const char *))
!                 { pt2Object = _Obj; fpt5=_fpt; };
  //1 bool
                  Functor(TClass* _Obj, void(TClass::*_fpt)(bool *))
!                 { pt2Object = _Obj; fpt6=_fpt; };
  
                  Functor(TClass* _Obj, void(TClass::*_fpt)(int))
!                 { pt2Object = _Obj; fpt7=_fpt; };
  
- // 
                  Functor(TClass* _Obj, void(TClass::*_fpt)(char))
!                 { pt2Object = _Obj; fpt8=_fpt; };
  
  		Functor(TClass* _Obj, void(TClass::*_fpt)(std::vector<std::string *> *d))
! 		{ pt2Object = _Obj, fpt9=_fpt; };		
! // 
  
                  Functor(TClass* _Obj, void(TClass::*_fpt)(std::vector<std::string *> *d, int &))
!                 { pt2Object = _Obj, fpt10=_fpt; }
  
                  Functor(TClass* _pt2Object, void(TClass::*_fpt)(std::string &, int&))
!                 { pt2Object = _pt2Object;  fpt11=_fpt; };
  
  		virtual ~Functor(){};
  
-                 virtual void Call()
-                 {
-                         (*pt2Object.*fpt1)();
-                 };
-                 virtual void Call(std::string &string)
-                 {
-                         (*pt2Object.*fpt2)(string);
-                 };  // execute member function
- 
-                virtual void Call(const char *string)
-                 {
-                         (*pt2Object.*fpt3)(string);
-                 };
-                 virtual void Call(const char *string[])
-                 {
-                         (*pt2Object.*fpt4)(string);
-                 };
-                 virtual void Call(const char *s1, const char *s2)
-                 {
-                         (*pt2Object.*fpt5)(s1, s2);
-                 };
-                 virtual void Call(bool *b1)
-                 {
-                         (*pt2Object.*fpt6)(b1);
-                 };
-                 virtual void Call(int b1)
-                 {
-                         (*pt2Object.*fpt7)(b1);
-                 };
- 
-                 virtual void Call(char b1)
-                 {
-                         (*pt2Object.*fpt8)(b1);
-                 };
- 		virtual void Call(std::vector<std::string *> *d)
- 		{
- 			(*pt2Object.*fpt9)(d);
- 		}
- 
-                 virtual void Call(std::vector<std::string *> *d, int &sock_in)
-                 {
-                         (*pt2Object.*fpt10)(d, sock_in);
-                 }
-                 virtual void Call(std::string &string, int &sock_in)
-                 {
-                         (*pt2Object.*fpt11)(string, sock_in);
-                 };  // execute member function
- 
- 
  };
  
--- 46,207 ----
  		void (TClass::*fpt10)(std::vector<std::string *> *d, int &sock_in);
  		void (TClass::*fpt11)(std::string &, int&);		
+ 		void (TClass::*fpt12)(std::vector<std::string *> *, int &, bool);
                  TClass* pt2Object; // pointer to object
  
          public:
+ 		//Singularlized Call Method {{{
+ 		virtual void *Call(std::vector<std::string>&d, int &sock_in, bool *isDown) {
+ 		            //Comments {{{
+             //ok, d[0] == command typed
+             //    d[1] == arg1
+             //    d[2] == arg2, etc.
+             //    sometimes socket can be ignored
+             // }}}
+             if(fpt1 != NULL) { // fpt1() no args {{{
+                 (*pt2Object.*fpt1)();
+             // }}}
+             } else if(fpt2 != NULL) { // fpt2(std::string &)  {{{
+                 std::string a;
+                 unsigned int x;
+                 for(x = 0; x < d.size(); x++) {
+                     a.append(d[x]);
+                     a.append(" ");
+                 }
+                 (*pt2Object.*fpt2)(a);
+             // }}}
+             } else if(fpt3 != NULL) { //fpt3(const char *); {{{
+                 if(d.size() >= 2) {
+                     (*pt2Object.*fpt3)(d[1].c_str());
+                 } else (*pt2Object.*fpt3)((const char *)NULL);
+             // }}}
+             } else if(fpt4 != NULL) { // (const char *array[]); {{{
+                 std::vector<const char *> buf;
+                 for(unsigned int c = 0; c < d.size(); ) {
+                     buf.push_back(d[c].c_str());
+                     c++;
+                     if( !(c < d.size() ) ) {
+                         buf.push_back(" ");
+                     }
+                 }
+                 (*pt2Object.*fpt4)(&buf[0]);
+             // }}}
+             } else if(fpt5 != NULL) { //(const char *, const char *); {{{
+                 if(d.size() < 2) {
+                     (*pt2Object.*fpt5)((const char *)NULL, (const char *)NULL);
+                 } else if(d.size() < 3) {
+                     (*pt2Object.*fpt5)(d[1].c_str(), (const char *)NULL);
+                 } else {
+                     (*pt2Object.*fpt5)(d[1].c_str(), d[2].c_str());
+                 }
+             //}}}
+             } else if(fpt6 != NULL) { //(bool *); {{{
+                 (*pt2Object.*fpt6)(isDown);
+             // }}}
+             }else if(fpt7 != NULL) { // (int) {{{
+                 if(d.size() < 2) {
+                     (*pt2Object.*fpt7)(0);
+                 } else {
+                     (*pt2Object.*fpt7)(atoi(d[1].c_str()));
+ 
+                 }
+             // }}}
+             } else if(fpt8 != NULL) { // (char) {{{
+                 if(d.size() < 2) {
+                     char err = 0;
+                     (*pt2Object.*fpt8)(err);
+                 }  else {
+                     (*pt2Object.*fpt8)(d[1][0]);
+                 }
+             // }}}
+             } else if(fpt9 != NULL) { // (std::vector<std::string *> *d) {{{
+                 std::vector<std::string *> dup;
+                 std::vector<std::string>::iterator ptr = d.begin();
+                 while(ptr < d.end()) {
+                     dup.push_back(&(*(ptr)));
+                     ptr++;
+                 }
+                 (*pt2Object.*fpt9)(&dup);
+             // }}}
+             } else if(fpt10 != NULL) { // (std::vector<std::string *> *d, int) {{{
+                 std::vector<std::string *> dup;
+                 std::vector<std::string>::iterator ptr = d.begin();
+                 while(ptr < d.end()) {
+                     dup.push_back(&(*(ptr)));
+                     ptr++;
+                 }
+                 (*pt2Object.*fpt10)(&dup, sock_in);
+             // }}}
+             } else if(fpt11 != NULL) { //(std::string &, int&); {{{
+                 std::string a;
+                 unsigned int x;
+                 for(x = 0; x < d.size(); x++) {
+                     a.append(d[x]);
+                     a.append(" ");
+                 }
+                 (*pt2Object.*fpt11)(a, sock_in);
+             // }}}
+             } else if(fpt12 != NULL) { //(std::vector<std::string *> *, int &, bool); // {{{
+                 std::vector<std::string *> dup;
+                 std::vector<std::string>::iterator ptr = d.begin();
+                 while(ptr < d.end()) {
+                     dup.push_back(&(*(ptr)));
+                     ptr++;
+                 }
+                 (*pt2Object.*fpt12)(&dup, sock_in, false);
+             } // }}}
+             return &(attribs._return);
+             return NULL;
+ 
+ 		} // }}}
+         void nullify() { // Set all the fpt's to null {{{
+             fpt1 = NULL;
+             fpt2 = NULL;
+             fpt3 = NULL;
+             fpt4 = NULL;
+             fpt5 = NULL;
+             fpt6 = NULL;
+             fpt7 = NULL;
+             fpt8 = NULL;
+             fpt9 = NULL;
+             fpt10 = NULL;
+             fpt11 = NULL;
+             fpt12 = NULL;
+         }; // Nullify }}}
+ 
  //no arguements at all.
                  Functor(TClass* _pt2Object, void(TClass::*_fpt)())
!                 {nullify(); pt2Object = _pt2Object;  fpt1=_fpt;};
  //1 std::string
                  Functor(TClass* _pt2Object, void(TClass::*_fpt)(std::string &))
!                 {nullify(); pt2Object = _pt2Object;  fpt2=_fpt; };
  //1 c string
  		Functor(TClass* _pt2Object, void(TClass::*_fpt)(const char *))
! 		{nullify(); pt2Object = _pt2Object;  fpt3=_fpt;};
                  Functor(TClass* _pt2Object, void(TClass::*_fpt)(const char *array[]))
!                 {nullify(); pt2Object = _pt2Object; fpt4=_fpt;};
  //2 c strings
                  Functor(TClass* _Obj, void(TClass::*_fpt)(const char *, const char *))
!                 {nullify(); pt2Object = _Obj; fpt5=_fpt; };
  //1 bool
                  Functor(TClass* _Obj, void(TClass::*_fpt)(bool *))
!                 {nullify(); pt2Object = _Obj; fpt6=_fpt; };
  
                  Functor(TClass* _Obj, void(TClass::*_fpt)(int))
!                 {nullify(); pt2Object = _Obj; fpt7=_fpt; };
  
                  Functor(TClass* _Obj, void(TClass::*_fpt)(char))
!                 {nullify(); pt2Object = _Obj; fpt8=_fpt; };
  
  		Functor(TClass* _Obj, void(TClass::*_fpt)(std::vector<std::string *> *d))
! 		{nullify(); pt2Object = _Obj, fpt9=_fpt; };		
  
                  Functor(TClass* _Obj, void(TClass::*_fpt)(std::vector<std::string *> *d, int &))
!                 { nullify();pt2Object = _Obj, fpt10=_fpt; }
  
                  Functor(TClass* _pt2Object, void(TClass::*_fpt)(std::string &, int&))
!                 {nullify(); pt2Object = _pt2Object;  fpt11=_fpt; };
  
  		virtual ~Functor(){};
  
  };
  

--- NEW FILE: setup ---
autoreconf
libtoolize -c
automake -a

Index: command.cpp
===================================================================
RCS file: /cvsroot/namc/newengine/command.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** command.cpp	5 Nov 2005 07:18:55 -0000	1.10
--- command.cpp	12 Dec 2005 01:11:17 -0000	1.11
***************
*** 446,534 ****
  			//gets really large.
  			if(!isDown && theCommand->argtype != ARG_1BOOL) return false;
! 			switch(theCommand->argtype) {
! 			case ARG_1INT:
! 				if(strvec.size() > 1)
! 				theCommand->functor->Call(atoi(strvec.at(1).c_str()));
! 				else theCommand->functor->Call(0);
! 				break;
! 			case ARG_NONE:
! 				theCommand->functor->Call();
! 				break; 
! 			case ARG_1CSTR:
! 				if(strvec.size() > 1)
! 				theCommand->functor->Call(strvec.at(1).c_str());
! 				else theCommand->functor->Call((const char *)NULL);
! 				break;
! 			case ARG_1CSTRARRAY: 
! 				{
! 					std::vector<const char*>w; 
! 					size_t vargs = 0;
! 					//put together a c style charactor array: char w[length] (1CSTRARRAY) {{{
! 				{ 
! 						for(std::vector<std::string>::iterator iter = strvec.begin(); iter < strvec.end(); iter++)
! 						{
! 							w.push_back((*(iter)).c_str());
! 							vargs++;
! 						}
! 				}
! 		// }}}
! 					if(vargs == 0)
! 						w[0] = incommand->c_str();
! 					const char *null = (const char *)NULL;
! 					w.push_back("");
! 					w[w.size()-1] = null;
! 					theCommand->functor->Call(&w[0]);
! 					break;
! 				}
! 			case ARG_2CSTR:
! 				if(strvec.size() > 2)
! 				theCommand->functor->Call(strvec.at(1).c_str(),strvec.at(2).c_str());
! 				else {
! 					if(strvec.size() == 2) theCommand->functor->Call(strvec.at(1).c_str(), (const char *)NULL);
! 					else theCommand->functor->Call((const char *)NULL, (const char *)NULL);
! 				}
! 				break;
! 			case ARG_1BOOL:
! 				theCommand->functor->Call((bool *)isDown);
! 				break; 
! 			case ARG_1STR: 
! 				{
! 					theCommand->functor->Call(*incommand);
! 					break;
! 				}
! 			case ARG_1STRSPEC:
! 				theCommand->functor->Call(*incommand);
! 				break;
! 			case ARG_1STRVEC: 
! 				{
! 					std::vector<std::string *> stringvec;
! 					{
! 						for(std::string::size_type x = 0; x < strvec.size(); x++) 
! 						{
! 							stringvec.push_back(&strvec.at(x));
! 						}
! 					}
! 					theCommand->functor->Call(&stringvec);
! 					break;
! 				}
! 			case ARG_1STRVECSPEC:
! 				{
! 					std::vector<std::string *> stringvec;
! 					{
! 						for(std::string::size_type x = 0; x < strvec.size(); x++) 
! 						{
! 							stringvec.push_back(&strvec.at(x));
! 						} 
! 					}
! 					theCommand->functor->Call(&stringvec);
! 					break;
! 				}
! 			default:
! 				std::string err1;
! 				err1.append("\n\rError, unsupported argument type!\n\r");
! 				err1.append("Try using 1CSTRARRAY or 1STR!\n\r");
! 				conoutf(err1);
! 				break;
! 			}
  		//try to catch any errors that occured while executing
  		} catch (std::exception e) {
--- 446,451 ----
  			//gets really large.
  			if(!isDown && theCommand->argtype != ARG_1BOOL) return false;
! 			int sock_in = 0; // move sock_in to execute's arguments
! 			theCommand->functor->Call(strvec,sock_in, &isDown);
  		//try to catch any errors that occured while executing
  		} catch (std::exception e) {
***************
*** 552,700 ****
  	return true;
  
- 
- /* huge old execute function {{{
- //	if(!isDown)return false;
- //	std::string *command = incommand;
- 	std::string nulls;
- 	nulls.append("dummy");
- 	coms *theCommand; // null pointer, set below with findCommand
- 				// object in vector
- 			//this whole damn function needs re-worked.
- 	char *p = (char *)incommand->c_str();
-        const int MAXWORDS =  incommand->size();
- 	debugpr(incommand->c_str());
- 
-         char *w[25];
- 	bool breaker = false;
- 	size_t ylast = 0;
- 	std::string wreplace;
- 	//remove newlines
-         for(size_t y = incommand->find("\r\n"); y != std::string::npos; y = incommand->find("\r\n", y+1)) {
-                 incommand->replace(y, 2, "");
-         }
- 	//remove multiple spaces..
-         for(size_t y = incommand->find("  "); y != std::string::npos; y = incommand->find("  ", y+1)) {
-                 incommand->replace(y, 2, " ");
-         }
- 	//break up incommand by spaces
- 	size_t args = 0;
- 
- //        for(size_t ay = incommand->find(" "); breaker == false;ay = incommand->find(" ", ay+1))
- //        {
- //		w[args] = "";
- //                if(ay == std::string::npos) {
- //                        //we must do this next if, or if it's empty
-                         //it'll return a size of 1, and ylast will be 0
-                         //and it'll try to get the substring 0, 1
-                         //out of an object that actually has 0 objects in it
- //                        if(incommand->size() > 1) {
- //                                std::string x = incommand->substr(ylast, incommand->size()-ylast);
- //                                w[args] = (char *)x.c_str();
- //                        };
- //                        breaker = true; //break out of this for loop
- //
- //                } else {
- //                        std::string s = incommand->substr(ylast, ay-ylast);
- //                        w[args] = (char *)s.c_str();//newstring(incommand->substr(ylast, ay), strlen((const char *)incommand->substr(ylast, ay)) );
- //                        ylast = ay;
- //                        args++;
- //                }
- //        };
- 	//hmm.. this is borrowed from cube because the above doesn't
- 	//work in this particular case.
- 	int numargs = 25;
-         for(int i = 0; i < 25; i++) {
-             w[i] = "";
-             if(i>numargs) continue;
-             char *s = parseword(p);             // parse and evaluate exps
-             if(!s) { numargs = i; s = ""; };
- //            if(*s=='$') s = lookup(s);          // substitute variables
-             w[i] = s;
-         };
- 
- 	wreplace.append(incommand->c_str());
- 	//prepare for findCommand
-         size_t x = wreplace.find(" ");
-         std::string nstring;
-         if(!(x < std::string::npos)) {
-                 nstring.append(wreplace, 0, wreplace.size());
-         } else {
-                 size_t oldx = x;
-                 bool lessthan2 = false;
-                  if(x < 2) {
-                         x = wreplace.find(" ", x+1);
-                         lessthan2 = true;
-                 }
-                  if(x == std::string::npos)
-                         if(wreplace.size() > 1)
-                         nstring.append(wreplace.substr(oldx, wreplace.size()-oldx));
-                         else nstring.append(wreplace);
-                 else if(lessthan2) {
-                         if(wreplace.size() > 1)
-                         nstring.append(wreplace.substr(oldx, x));
-                         else nstring.append(wreplace);
-                 } else {
-                         if(wreplace.size() > 1)
-                         nstring.append(wreplace.substr(0, x));
-                         else nstring.append(wreplace);
-                 }
-         };
-  //findCommand will auto-complete commands :)
- //	conoutf((char *)nstring.c_str());
- 	theCommand = findCommand(nstring.c_str()); //find the command to execute
- 
- 	x = wreplace.find_first_of(nstring);
- 	if(x != std::string::npos) {
- 		wreplace.replace(x, nstring.size(), theCommand->Name);
- 	}
- 	w[0] = (char *)theCommand->Name.c_str();
- 	
- //	conoutf((char *)theCommand->Name.c_str());
- 
- 	switch(theCommand->argtype) {
- 		case ARG_1INT:
- 			if(isDown)
- 				theCommand->functor->Call(atoi(w[1]));
- 			break;
- 		case ARG_NONE:
- //			std::cout << "Case 1\n";
- 			if(isDown)
- 				theCommand->functor->Call();
- //			std::cout << "Finished call.\n";
- 			break; //this
- 		case ARG_1CSTR:
- //			 std::cout << "Case 2\n";
- 			if(isDown)
- 				theCommand->functor->Call(w[1]);
- //			std::cout << "finished call.";
- 			break;
- 		case ARG_1CSTRARRAY:
- 			if(isDown)
- 				theCommand->functor->Call(w);
- //			std::cout << "finished call.";
- 			break;
- 		case ARG_2CSTR:
- 			if(isDown)
- 				theCommand->functor->Call(w[1], w[2]);
- 			break;
- 		case ARG_1BOOL:
- 			theCommand->functor->Call((bool *)isDown);
- 		//	vec is:
- 
- 			break; //oops
- 		case ARG_1STR: 
- 			theCommand->functor->Call(&wreplace);
- 			break;	
- 		default: 
- 			if(isDown)
- 				theCommand->functor->Call(w);
- 
- 			break;
- 	}
- 
- 
- //	delete theCommand;
- 	return true;	
- */ // }}}
  };
  // }}}
--- 469,472 ----

Index: configure.ac
===================================================================
RCS file: /cvsroot/namc/newengine/configure.ac,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** configure.ac	5 Oct 2005 08:01:14 -0000	1.2
--- configure.ac	12 Dec 2005 01:11:17 -0000	1.3
***************
*** 5,21 ****
  AC_CONFIG_SRCDIR([.])
  AC_CONFIG_HEADER([config.h])
  AM_INIT_AUTOMAKE(namc, 0.69.3)
  
  # Checks for programs.
  AC_PROG_CXX(g++)
! AC_PROG_CC
  
  
  # Checks for libraries.
! AC_CHECK_LIB([GL], [main])
! AC_CHECK_LIB([glut], [glutAddMenuEntry])
! AC_CHECK_LIB([SDL], [SDL_ShowCursor])
! AC_CHECK_LIB([SDL_image], [IMG_Load])
! AC_CHECK_LIB([SDL_mixer], [Mix_OpenAudio])
  #AC_CHECK_LIB([enet], [ENetSocket])
  AC_CHECK_LIB([z], [inflate])
--- 5,26 ----
  AC_CONFIG_SRCDIR([.])
  AC_CONFIG_HEADER([config.h])
+ AC_CANONICAL_TARGET
  AM_INIT_AUTOMAKE(namc, 0.69.3)
  
  # Checks for programs.
  AC_PROG_CXX(g++)
! AC_LANG_CPLUSPLUS
! AC_PROG_LIBTOOL
  
+ SDL_VERSION=1.2.0
+ AM_PATH_SDL($SDL_VERSION,:,AC_MSG_ERROR([*** SDL version $SDL_VERSION not found!]))
+ CXXFLAGS="$CXXFLAGS $SDL_CFLAGS"
+ LIBS="$LIBS $SDL_LIBS"
  
  # Checks for libraries.
! AC_CHECK_LIB([GL], [main],,[AC_MSG_ERROR([*** main not found in libGL, most likely you do not have a GL Library. Get one! Try nvidia, mesa, or ATI unless you have an old card. You're on your own finding and installing this!])])
! AC_CHECK_LIB([glut], [glutAddMenuEntry],,[AC_MSG_ERROR([*** glutAddMenuEntry not found, most likely reason is glut is missing which is required by NAMC])])
! AC_CHECK_LIB([SDL_image], [IMG_Load],,[AC_MSG_ERROR([*** Could not find IMG_Load\(\) in SDL_Image library, get SDL_Image from http://www.libsdl.org/projects/SDL_image/ ])])
! AC_CHECK_LIB([SDL_mixer], [Mix_OpenAudio],,[AC_MSG_ERROR([*** Mix_OpenAudio not found in libSDL_Mixer, get it from http://www.libsdl.org/projects/SDL_mixer/ ])])
  #AC_CHECK_LIB([enet], [ENetSocket])
  AC_CHECK_LIB([z], [inflate])
***************
*** 24,28 ****
  AC_HEADER_STDC
  AC_HEADER_SYS_WAIT
! AC_CHECK_HEADERS([arpa/inet.h fcntl.h limits.h netdb.h netinet/in.h stdlib.h string.h sys/socket.h unistd.h time.h GL/glext.h GL/glut.h GL/glu.h GL/gl.h])
  # Checks for typedefs, structures, and compiler characteristics.
  AC_HEADER_STDBOOL
--- 29,43 ----
  AC_HEADER_STDC
  AC_HEADER_SYS_WAIT
! AC_CHECK_HEADERS([arpa/inet.h fcntl.h limits.h netdb.h netinet/in.h stdlib.h string.h sys/socket.h unistd.h time.h GL/gl.h ])
! AC_CHECK_HEADERS([ GL/glext.h],,,
! [[ #if HAVE_GL_GL_H
! #include <GL/gl.h>
! #endif
! ]])
! AC_CHECK_HEADERS([ GL/glut.h GL/glu.h ],,, 
! [[ #if HAVE_GL_H
! # include <gl.h>
! #endif 
! ]])
  # Checks for typedefs, structures, and compiler characteristics.
  AC_HEADER_STDBOOL

Index: Makefile.am
===================================================================
RCS file: /cvsroot/namc/newengine/Makefile.am,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Makefile.am	25 Oct 2005 04:14:49 -0000	1.4
--- Makefile.am	12 Dec 2005 01:11:17 -0000	1.5
***************
*** 2,10 ****
  gravsim_SOURCES = SShapes.cpp shapes.cpp rendertext.cpp worldsheet.cpp renderGL.cpp main.cpp localPlayer.cpp tools.cpp command.cpp md2.cpp sauerbcube.cpp music.cpp 
  gravsim_LDADD = 
! gravsim_LDFLAGS = `sdl-config --libs` -lSDL_image -lSDL_mixer -lz -lGL
  AM_CPPFLAGS =  
  AM_CXXFLAGS =  
  gravsim_CXXOPTFLAGS=-Wall 
! gravsim_CXXFLAGS=$(gravsim_CXXOPTFLAGS)  `sdl-config --cflags`
  AM_CFLAGS = 
  AM_LDFLAGS =  
--- 2,10 ----
  gravsim_SOURCES = SShapes.cpp shapes.cpp rendertext.cpp worldsheet.cpp renderGL.cpp main.cpp localPlayer.cpp tools.cpp command.cpp md2.cpp sauerbcube.cpp music.cpp 
  gravsim_LDADD = 
! gravsim_LDFLAGS = -lSDL_image -lSDL_mixer -lz -lGL
  AM_CPPFLAGS =  
  AM_CXXFLAGS =  
  gravsim_CXXOPTFLAGS=-Wall 
! gravsim_CXXFLAGS=$(gravsim_CXXOPTFLAGS)  
  AM_CFLAGS = 
  AM_LDFLAGS =  

Index: libtool
===================================================================
RCS file: /cvsroot/namc/newengine/libtool,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** libtool	29 Sep 2005 19:02:33 -0000	1.1.1.1
--- libtool	12 Dec 2005 01:11:17 -0000	1.2
***************
*** 51,55 ****
  
  # Whether or not to build shared libraries.
! build_libtool_libs=no
  
  # Whether or not to build static libraries.
--- 51,55 ----
  
  # Whether or not to build shared libraries.
! build_libtool_libs=yes
  
  # Whether or not to build static libraries.
***************
*** 57,61 ****
  
  # Whether or not to add -lc for building shared libraries.
! build_libtool_need_lc=yes
  
  # Whether or not to disallow shared libs when runtime libs are static
--- 57,61 ----
  
  # Whether or not to add -lc for building shared libraries.
! build_libtool_need_lc=no
  
  # Whether or not to disallow shared libs when runtime libs are static
***************
*** 63,67 ****
  
  # Whether or not to optimize for fast installation.
! fast_install=needless
  
  # The host system.
--- 63,67 ----
  
  # Whether or not to optimize for fast installation.
! fast_install=yes
  
  # The host system.
***************
*** 77,84 ****
  
  # A C compiler.
! LTCC="gcc"
  
  # A language-specific compiler.
! CC="gcc"
  
  # Is the compiler the GNU C compiler?
--- 77,84 ----
  
  # A C compiler.
! LTCC="/usr/local/arm/3.4.1/arm-linux/bin/gcc"
  
  # A language-specific compiler.
! CC="/usr/local/arm/3.4.1/arm-linux/bin/gcc"
  
  # Is the compiler the GNU C compiler?
***************
*** 89,93 ****
  
  # The linker used to build libraries.
! LD="/usr/bin/ld"
  
  # Whether we need hard or soft links.
--- 89,93 ----
  
  # The linker used to build libraries.
! LD="/usr/local/arm/3.4.1/arm-linux/bin/ld"
  
  # Whether we need hard or soft links.
***************
*** 317,324 ****
  
  # Compile-time system search path for libraries
! sys_lib_search_path_spec=" /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/ /usr/lib/gcc/i386-redhat-linux/3.3.3/ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/../../../../i386-redhat-linux/lib/i386-redhat-linux/3.3.3/ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/../../../../i386-redhat-linux/lib/ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/../../../i386-redhat-linux/3.3.3/ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/../../../ /lib/i386-redhat-linux/3.3.3/ /lib/ /usr/lib/i386-redhat-linux/3.3.3/ /usr/lib/"
  
  # Run-time system search path for libraries
! sys_lib_dlsearch_path_spec="/lib /usr/lib /usr/kerberos/lib /usr/lib/qt-3.1/lib /usr/lib /usr/local/lib /usr/lib/mysql /usr/local/lib/ao/plugins-2/ /usr/local/lib/python2.2/site-packages/gtk-2.0/gtk /usr/local/BerkeleyDB.3.3/lib /usr/local/lib/python2.2/site-packages/gtk-2.0 /usr/lib/sane /usr/X11R6/lib /usr/lib/qt-3.3/lib /usr/local/lib/acp /usr/lib/transgaming_cedega/winex /usr/lib/wine "
  
  # Fix the shell variable $srcfile for the compiler.
--- 317,324 ----
  
  # Compile-time system search path for libraries
! sys_lib_search_path_spec=" /usr/local/arm/3.4.1/arm-linux/bin/../lib/gcc/arm-linux/3.4.1/ /usr/local/arm/3.4.1/arm-linux/bin/../lib/gcc/ /usr/local/arm/3.4.1/lib/gcc/arm-linux/3.4.1/ /usr/lib/gcc/arm-linux/3.4.1/ /usr/local/arm/3.4.1/arm-linux/bin/../lib/gcc/arm-linux/3.4.1/../../../../arm-linux/lib/arm-linux/3.4.1/ /usr/local/arm/3.4.1/arm-linux/bin/../lib/gcc/arm-linux/3.4.1/../../../../arm-linux/lib/ /usr/local/arm/3.4.1/lib/gcc/arm-linux/3.4.1/../../../../arm-linux/lib/arm-linux/3.4.1/ /usr/local/arm/3.4.1/lib/gcc/arm-linux/3.4.1/../../../../arm-linux/lib/"
  
  # Run-time system search path for libraries
! sys_lib_dlsearch_path_spec="/lib /usr/lib /usr/kerberos/lib /usr/lib/qt-3.1/lib /usr/lib /usr/local/lib /usr/lib/mysql /usr/local/lib/ao/plugins-2/ /usr/local/lib/python2.2/site-packages/gtk-2.0/gtk /usr/local/BerkeleyDB.3.3/lib /usr/local/lib/python2.2/site-packages/gtk-2.0 /usr/lib/sane /usr/X11R6/lib /usr/lib/qt-3.3/lib /usr/local/lib/acp /usr/lib/transgaming_cedega/winex  "
  
  # Fix the shell variable $srcfile for the compiler.
***************
*** 6775,6779 ****
  
  # Whether or not to build shared libraries.
! build_libtool_libs=no
  
  # Whether or not to build static libraries.
--- 6775,6779 ----
  
  # Whether or not to build shared libraries.
! build_libtool_libs=yes
  
  # Whether or not to build static libraries.
***************
*** 6787,6791 ****
  
  # Whether or not to optimize for fast installation.
! fast_install=needless
  
  # The host system.
--- 6787,6791 ----
  
  # Whether or not to optimize for fast installation.
! fast_install=yes
  
  # The host system.
***************
*** 6801,6805 ****
  
  # A C compiler.
! LTCC="gcc"
  
  # A language-specific compiler.
--- 6801,6805 ----
  
  # A C compiler.
! LTCC="/usr/local/arm/3.4.1/arm-linux/bin/gcc"
  
  # A language-specific compiler.
***************
*** 6813,6817 ****
  
  # The linker used to build libraries.
! LD="/usr/bin/ld"
  
  # Whether we need hard or soft links.
--- 6813,6817 ----
  
  # The linker used to build libraries.
! LD="/usr/local/arm/3.4.1/arm-linux/bin/ld"
  
  # Whether we need hard or soft links.
***************
*** 6942,6950 ****
  # Dependencies to place before the objects being linked to create a
  # shared library.
! predep_objects="/usr/lib/gcc-lib/i386-redhat-linux/3.3.3/../../../crti.o /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/crtbeginS.o"
  
  # Dependencies to place after the objects being linked to create a
  # shared library.
! postdep_objects="/usr/lib/gcc-lib/i386-redhat-linux/3.3.3/crtendS.o /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/../../../crtn.o"
  
  # Dependencies to place before the objects being linked to create a
--- 6942,6950 ----
  # Dependencies to place before the objects being linked to create a
  # shared library.
! predep_objects="/usr/lib/crti.o /usr/local/lib/gcc/i686-pc-linux-gnu/4.1.0/crtbeginS.o"
  
  # Dependencies to place after the objects being linked to create a
  # shared library.
! postdep_objects="/usr/local/lib/gcc/i686-pc-linux-gnu/4.1.0/crtendS.o /usr/lib/crtn.o"
  
  # Dependencies to place before the objects being linked to create a
***************
*** 6958,6962 ****
  # The library search path used internally by the compiler when linking
  # a shared library.
! compiler_lib_search_path="-L/usr/lib/gcc-lib/i386-redhat-linux/3.3.3 -L/usr/lib/gcc-lib/i386-redhat-linux/3.3.3/../../.."
  
  # Method to check whether dependent libraries are shared objects.
--- 6958,6962 ----
  # The library search path used internally by the compiler when linking
  # a shared library.
! compiler_lib_search_path="-L/usr/local/lib/gcc/i686-pc-linux-gnu/4.1.0 -L/usr/local/lib/gcc/i686-pc-linux-gnu/4.1.0/../../.."
  
  # Method to check whether dependent libraries are shared objects.
***************
*** 7038,7045 ****
  
  # Compile-time system search path for libraries
! sys_lib_search_path_spec=" /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/ /usr/lib/gcc/i386-redhat-linux/3.3.3/ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/../../../../i386-redhat-linux/lib/i386-redhat-linux/3.3.3/ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/../../../../i386-redhat-linux/lib/ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/../../../i386-redhat-linux/3.3.3/ /usr/lib/gcc-lib/i386-redhat-linux/3.3.3/../../../ /lib/i386-redhat-linux/3.3.3/ /lib/ /usr/lib/i386-redhat-linux/3.3.3/ /usr/lib/"
  
  # Run-time system search path for libraries
! sys_lib_dlsearch_path_spec="/lib /usr/lib /usr/kerberos/lib /usr/lib/qt-3.1/lib /usr/lib /usr/local/lib /usr/lib/mysql /usr/local/lib/ao/plugins-2/ /usr/local/lib/python2.2/site-packages/gtk-2.0/gtk /usr/local/BerkeleyDB.3.3/lib /usr/local/lib/python2.2/site-packages/gtk-2.0 /usr/lib/sane /usr/X11R6/lib /usr/lib/qt-3.3/lib /usr/local/lib/acp /usr/lib/transgaming_cedega/winex /usr/lib/wine "
  
  # Fix the shell variable $srcfile for the compiler.
--- 7038,7045 ----
  
  # Compile-time system search path for libraries
! sys_lib_search_path_spec=" /usr/local/lib/gcc/i686-pc-linux-gnu/4.1.0/ /usr/lib/gcc/i686-pc-linux-gnu/4.1.0/ /usr/local/lib/gcc/i686-pc-linux-gnu/4.1.0/../../../../i686-pc-linux-gnu/lib/i686-pc-linux-gnu/4.1.0/ /usr/local/lib/gcc/i686-pc-linux-gnu/4.1.0/../../../../i686-pc-linux-gnu/lib/ /usr/local/lib/gcc/i686-pc-linux-gnu/4.1.0/../../../i686-pc-linux-gnu/4.1.0/ /usr/local/lib/gcc/i686-pc-linux-gnu/4.1.0/../../../ /lib/i686-pc-linux-gnu/4.1.0/ /lib/ /usr/lib/i686-pc-linux-gnu/4.1.0/ /usr/lib/"
  
  # Run-time system search path for libraries
! sys_lib_dlsearch_path_spec="/lib /usr/lib /usr/kerberos/lib /usr/lib/qt-3.1/lib /usr/lib /usr/local/lib /usr/lib/mysql /usr/local/lib/ao/plugins-2/ /usr/local/lib/python2.2/site-packages/gtk-2.0/gtk /usr/local/BerkeleyDB.3.3/lib /usr/local/lib/python2.2/site-packages/gtk-2.0 /usr/lib/sane /usr/X11R6/lib /usr/lib/qt-3.3/lib /usr/local/lib/acp /usr/lib/transgaming_cedega/winex  "
  
  # Fix the shell variable $srcfile for the compiler.
***************
*** 7071,7075 ****
  
  # Whether or not to build shared libraries.
! build_libtool_libs=no
  
  # Whether or not to build static libraries.
--- 7071,7075 ----
  
  # Whether or not to build shared libraries.
! build_libtool_libs=yes
  
  # Whether or not to build static libraries.
***************
*** 7083,7087 ****
  
  # Whether or not to optimize for fast installation.
! fast_install=needless
  
  # The host system.
--- 7083,7087 ----
  
  # Whether or not to optimize for fast installation.
! fast_install=yes
  
  # The host system.
***************
*** 7097,7101 ****
  
  # A C compiler.
! LTCC="gcc"
  
  # A language-specific compiler.
--- 7097,7101 ----
  
  # A C compiler.
! LTCC="/usr/local/arm/3.4.1/arm-linux/bin/gcc"
  
  # A language-specific compiler.
***************
*** 7109,7113 ****
  
  # The linker used to build libraries.
! LD="/usr/bin/ld"
  
  # Whether we need hard or soft links.
--- 7109,7113 ----
  
  # The linker used to build libraries.
! LD="/usr/local/arm/3.4.1/arm-linux/bin/ld"
  
  # Whether we need hard or soft links.
***************
*** 7340,7344 ****
  
  # Run-time system search path for libraries
! sys_lib_dlsearch_path_spec="/lib /usr/lib /usr/kerberos/lib /usr/lib/qt-3.1/lib /usr/lib /usr/local/lib /usr/lib/mysql /usr/local/lib/ao/plugins-2/ /usr/local/lib/python2.2/site-packages/gtk-2.0/gtk /usr/local/BerkeleyDB.3.3/lib /usr/local/lib/python2.2/site-packages/gtk-2.0 /usr/lib/sane /usr/X11R6/lib /usr/lib/qt-3.3/lib /usr/local/lib/acp /usr/lib/transgaming_cedega/winex /usr/lib/wine "
  
  # Fix the shell variable $srcfile for the compiler.
--- 7340,7344 ----
  
  # Run-time system search path for libraries
! sys_lib_dlsearch_path_spec="/lib /usr/lib /usr/kerberos/lib /usr/lib/qt-3.1/lib /usr/lib /usr/local/lib /usr/lib/mysql /usr/local/lib/ao/plugins-2/ /usr/local/lib/python2.2/site-packages/gtk-2.0/gtk /usr/local/BerkeleyDB.3.3/lib /usr/local/lib/python2.2/site-packages/gtk-2.0 /usr/lib/sane /usr/X11R6/lib /usr/lib/qt-3.3/lib /usr/local/lib/acp /usr/lib/transgaming_cedega/winex  "
  
  # Fix the shell variable $srcfile for the compiler.

Index: rendertext.cpp
===================================================================
RCS file: /cvsroot/namc/newengine/rendertext.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** rendertext.cpp	5 Oct 2005 08:01:14 -0000	1.5
--- rendertext.cpp	12 Dec 2005 01:11:17 -0000	1.6
***************
*** 395,399 ****
  //				add.append(cooked);	
  //				strncpy(commandbuf, add.c_str(), strlen(cooked)+add.size());
! 				 char add[] = { cooked, 0 }; commandbuf.append(add); 
  				};
  				break;
--- 395,399 ----
  //				add.append(cooked);	
  //				strncpy(commandbuf, add.c_str(), strlen(cooked)+add.size());
! 				commandbuf += cooked;//.append(add); 
  				};
  				break;

Index: README
===================================================================
RCS file: /cvsroot/namc/newengine/README,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** README	1 Oct 2005 23:10:52 -0000	1.2
--- README	12 Dec 2005 01:11:17 -0000	1.3
***************
*** 1,7 ****
  To compile:
! autoreconf
  ./configure && make
  
- (Configure might complain about glut.h not compiling, but if it's on your system it will all work, you can ignore this warning. )
  
  to run:
--- 1,6 ----
  To compile:
! ./setup
  ./configure && make
  
  
  to run:
***************
*** 12,16 ****
  (so if gravsim is in ./ , packages should be: ./packages .. data should be ./data , links work fine)
  
! If you are having problems with loading files, especially the data/ files (autoexec.cfg, default_map_settings.cfg, and keymap.cfg), make sure they are in DOS format. (you may have to run: unix2dos autoexec.cfg for example. the autoexec file was in unix format previously).
  If it's not load time will jump increadably high, and the command processor will dump the same stuff over and over (You'll know it when you see it.)
  
--- 11,15 ----
  (so if gravsim is in ./ , packages should be: ./packages .. data should be ./data , links work fine)
  
! If you are having problems with loading files, especially the data/ files (autoexec.cfg, default_map_settings.cfg, and keymap.cfg), make sure they are in DOS format. (you may have to run: unix2dos autoexec.cfg for example. the autoexec file was in unix format previously). (This requirement will end very soon)
  If it's not load time will jump increadably high, and the command processor will dump the same stuff over and over (You'll know it when you see it.)
  

Index: vObject.h
===================================================================
RCS file: /cvsroot/namc/newengine/vObject.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** vObject.h	5 Nov 2005 07:18:55 -0000	1.5
--- vObject.h	12 Dec 2005 01:11:17 -0000	1.6
***************
*** 29,47 ****
  #error You have GLEXT but don't have glext.h , check your OpenGL implimentation
  #endif
! #ifdef HAVE_LIBSDL
  #include <SDL.h>
! #else
! #error You don't have SDL installed, www.libsdl.org
! #endif
! #ifdef HAVE_LIBSDL_IMAGE
  #include <SDL_image.h>
- #else
- #error You don't have SDL_IMAGE installed, www.libsdl.org/projects/sdl_image I think
- #endif
- #ifdef HAVE_LIBSDL_MIXER
  #include <SDL/SDL_mixer.h>
- #else
- #error You don't have SDL_MIXER installed!, www.libsdl.org/projects/sdl_mixer I think
- #endif
  #ifdef HAVE_LIBZ
  #include <zlib.h>
--- 29,37 ----
  #error You have GLEXT but don't have glext.h , check your OpenGL implimentation
  #endif
! //Don't 
  #include <SDL.h>
! 
  #include <SDL_image.h>
  #include <SDL/SDL_mixer.h>
  #ifdef HAVE_LIBZ
  #include <zlib.h>

Index: music.cpp
===================================================================
RCS file: /cvsroot/namc/newengine/music.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** music.cpp	25 Oct 2005 04:14:49 -0000	1.1
--- music.cpp	12 Dec 2005 01:11:17 -0000	1.2
***************
*** 1,4 ****
  #include <ctime>
! #include "SDL_mixer.h"
  #include "SDL_thread.h"
  #include "music.h"
--- 1,4 ----
  #include <ctime>
! #include <SDL/SDL_mixer.h>
  #include "SDL_thread.h"
  #include "music.h"

[Namc-developer] Goals

[Balaji G <bal...@gm...>]

Great Work :-)

Very good comprehensive list of NAMC features. Great !!. To implement
these features we could have a state machine :-) That would be really
good i believe and it would be a good learning experience too :-). I
ve not still submitted the current features of NAMC coz i am not well.
I am having severe cold and fever hence, not able to sit in front of
the system :-(. i ve also not done much in the new Graphics engine
that i am working on this week. I hope to start off once i am better.
We could now prioritize these features and start working on :-)

Regards
Balaji

[Namc-developer] Goals

[Matthew <rog...@co...>]

They are in no particular order

Long Term Goals:
1) Different physics modes (Flightsim mode & fps mode)
2) Real time dynamic software lighting
3) Collision detection and response
4) Different sounds coming from different objects in the world
5) To make an engine to make games on.

Short term goals
1) Finish Occullusion
2) Viewport modes (fps, trailing camera, locked top-down)
3) Full screen toggle
4) Background music player object
5) Volume control for 4
6) Basic Collision detection and response....
7) Game Units - monsters, items, weapons, ammunitions, vehicles, scrolls,  
etc
8) Basic OpenGL lighting construct - to eventually be replaced with  
software

Other long term feature goals:
1) 3D Terrain Generations (Sauerbcubes)
2) fast shadows
3) Massively Multiplayer online support

This is by no means a definitive list of what namc will/should have in the  
end, it just contains everything I can think of as of right now that  
should be implimented to create any kind of 3D game.

--Rogue


-- 
Using Opera's revolutionary e-mail client: http://www.opera.com/m2/

[Namc-developer] newengine command.cpp,1.9,1.10 localPlayer.cpp,1.9,1.10 main.cpp,1.2,1.3 renderGL.cpp,1.8,1.9 renderGL.h,1.3,1.4 renderWorld.h,1.2,1.3 tools.cpp,1.4,1.5 tools.h,1.12,1.13 vObject.h,1.4,1.5 worldsheet.cpp,1.8,1.9 worldsheet.h,1.4,1.5

[Matthew <rog...@us...>]

Update of /cvsroot/namc/newengine
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10317

Modified Files:
	command.cpp localPlayer.cpp main.cpp renderGL.cpp renderGL.h 
	renderWorld.h tools.cpp tools.h vObject.h worldsheet.cpp 
	worldsheet.h 
Log Message:
updates


Index: tools.h
===================================================================
RCS file: /cvsroot/namc/newengine/tools.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** tools.h	25 Oct 2005 04:14:49 -0000	1.12
--- tools.h	5 Nov 2005 07:18:55 -0000	1.13
***************
*** 100,107 ****
  	vec(float X, float Y, float Z) {x = X; y = Y; z = Z; };
  	vec(const vec &in) { x = in.x; y = in.y; z = in.z; };
! 	bool operator<( vec &two) {
  			if(x < two.x && y < two.y && z < two.z) return true;
  			return false;
  	}
  	bool ab( vec &two) { //about equals
  			vec comb(x+two.x, y+two.y, z+two.z);
--- 100,127 ----
  	vec(float X, float Y, float Z) {x = X; y = Y; z = Z; };
  	vec(const vec &in) { x = in.x; y = in.y; z = in.z; };
! 	bool operator<( vec &two)  const{
  			if(x < two.x && y < two.y && z < two.z) return true;
  			return false;
  	}
+ 	bool operator>(float what)  const{
+ 		if(what > x || what > y || what > z) return true;
+ 		return false;
+ 	}
+ 	bool operator>(int what)  const{
+ 		if(what > x || what > y || what > z) return true;
+ 		return false;
+ 	}
+ 	bool operator<(float what)  const{
+ 		if(what < x || what < y || what < z) return true;
+ 		return false;
+ 	}
+ 	bool operator<(int what)  const{
+ 		if(what < x || what < y || what < z) return true;
+ 		return false;
+ 	}
+ 	bool greater(int what) {
+ 		if(what > x || what > y || what > z) return true;
+         return false;
+ 	}
  	bool ab( vec &two) { //about equals
  			vec comb(x+two.x, y+two.y, z+two.z);

Index: renderGL.cpp
===================================================================
RCS file: /cvsroot/namc/newengine/renderGL.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** renderGL.cpp	12 Oct 2005 23:27:06 -0000	1.8
--- renderGL.cpp	5 Nov 2005 07:18:55 -0000	1.9
***************
*** 1,280 ****
  #include "renderGL.h"
  
! class OcculludeTable { // {{{
! 	friend class renderGL;
! 	friend class world;
! 	class ocMe {
! 		friend class OcculludeTable;
! 		friend class std::vector<ocMe>;
! 		OcculludeTable *thisone;
! 	};
[...1037 lines suppressed...]
! 				if(e1->isSelected) {
                          	        light.x=0.6f;light.y=1.8f;light.z=0.6f;
                                  }else
                  	                light.x=0.5f;light.y=0.5f;light.z=0.5f;
! 				e1->renderthis(light, (*(scroller)).x, (*(scroller)).y, (*(scroller)).z, e1->yaw, e1->pitch, e1->roll, World->lookuptexture(e1->texture, X, Y), e1->quadtype);
  			} //}}}
  			// TYPE_CUBE {{{
  			else if(e1->type == TYPE_CUBE) {
! //				world::anObject *anE = World->getObjectAt(worldSize);
  //                                vec light = { 20.0f, 20.0f, 20.0f };
! 				vec light;
! 				if(e1->isSelected) {
! 					light.x=0.6f;light.y=1.8f;light.z=0.6f;
! 				}else
! 					light.x=0.5f;light.y=0.5f;light.z=0.5f;
! //				vec newVec = { (*(scroller)).x, (*(scroller)).y, (*(scroller)).z };
  //				vec newVec2 = { 0, 0, 0 };
! 				e1->renderthis(light, (*(scroller)).x, (*(scroller)).y, (*(scroller)).z, e1->yaw, e1->pitch, e1->roll, World->lookuptexture(e1->texture, X, Y));
  			} // }}}
  			// TYPE_MM *Map Model {{{

Index: main.cpp
===================================================================
RCS file: /cvsroot/namc/newengine/main.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** main.cpp	25 Oct 2005 04:14:49 -0000	1.2
--- main.cpp	5 Nov 2005 07:18:55 -0000	1.3
***************
*** 1,5 ****
  #include "localPlayer.h"
  #include <math.h>
! 
  
  
--- 1,5 ----
  #include "localPlayer.h"
  #include <math.h>
! #include "music.h"
  
  
***************
*** 83,86 ****
--- 83,87 ----
  	lplayer = new localPlayer(World);
  	World->addObject((object *)lplayer, "monster/ogro");
+ 	MusicPlayer player;
  /*
  	object *earth = new object( "Earth", 5.9742*10E7);

Index: tools.cpp
===================================================================
RCS file: /cvsroot/namc/newengine/tools.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** tools.cpp	12 Oct 2005 21:20:17 -0000	1.4
--- tools.cpp	5 Nov 2005 07:18:55 -0000	1.5
***************
*** 341,347 ****
  	} else {
  			//get the size
! 		infile.seekg (0, std::ios::end);
! 		int length = infile.tellg();
! 		length=length;
  		infile.seekg (0, std::ios::beg);
  //		char buf[length+1];
--- 341,347 ----
  	} else {
  			//get the size
! 	//	infile.seekg (0, std::ios::end);
! 	//	int length = infile.tellg();
! 	//	length=length;
  		infile.seekg (0, std::ios::beg);
  //		char buf[length+1];

Index: localPlayer.cpp
===================================================================
RCS file: /cvsroot/namc/newengine/localPlayer.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** localPlayer.cpp	14 Oct 2005 06:08:20 -0000	1.9
--- localPlayer.cpp	5 Nov 2005 07:18:55 -0000	1.10
***************
*** 1,4 ****
--- 1,5 ----
  #include "localPlayer.h"
  #include <sstream>
+ SDL_Surface *mainwindow;
  class LPMouse : public Extensions {
      friend class localPlayer;
***************
*** 138,142 ****
  	gamelog("video: mode");
  	SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1);
! 	if(SDL_SetVideoMode(scr_w, scr_h, 0, SDL_OPENGL|fs)==NULL) fatal("Unable to create OpenGL screen");
  	gamelog("video: misc");
  	SDL_WM_SetCaption("Namc2 engine", NULL);
--- 139,147 ----
  	gamelog("video: mode");
  	SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1);
! 	if(fs != 0) {
! 		if( (mainwindow = SDL_SetVideoMode(scr_w, scr_h, 0, SDL_OPENGL|fs|SDL_HWSURFACE) )==NULL) fatal("Unable to create OpenGL screen");
! 	} else {
! 		if( (mainwindow = SDL_SetVideoMode(scr_w, scr_h, 0, SDL_OPENGL|SDL_HWSURFACE) )==NULL) fatal("Unable to create OpenGL screen");
! 	}
  	gamelog("video: misc");
  	SDL_WM_SetCaption("Namc2 engine", NULL);
***************
*** 186,189 ****
--- 191,195 ----
  //Destructor {{{ 
  localPlayer::~localPlayer() {
+ 	SDL_FreeSurface(mainwindow);
  	for(; keyMapVector.size() > 0;) {
  		keyMapVector.pop_back();
***************
*** 399,403 ****
  	glColor3fv((float *)&newVec);
  	glEnable(GL_BLEND);
! 	draw_textf("obs: %d", 20, 1630, 2, World->worldSize());
  	draw_textf("verts: %d", 600, 1630, 2, verts);
  	if(RText::rendermenu() == true) menuIsOn = true;
--- 405,409 ----
  	glColor3fv((float *)&newVec);
  	glEnable(GL_BLEND);
! 	draw_textf("obs: %d", 20, 1630, 2, renderGL::numrendering);
  	draw_textf("verts: %d", 600, 1630, 2, verts);
  	if(RText::rendermenu() == true) menuIsOn = true;

Index: renderWorld.h
===================================================================
RCS file: /cvsroot/namc/newengine/renderWorld.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** renderWorld.h	14 Oct 2005 02:52:17 -0000	1.2
--- renderWorld.h	5 Nov 2005 07:18:55 -0000	1.3
***************
*** 3,6 ****
--- 3,7 ----
  #define RENDERWORLD_INC 1
  #include "worldsheet.h" 
+ //unused class
  class renderWorld : public commandI {
  	public:

Index: renderGL.h
===================================================================
RCS file: /cvsroot/namc/newengine/renderGL.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** renderGL.h	14 Oct 2005 02:52:17 -0000	1.3
--- renderGL.h	5 Nov 2005 07:18:55 -0000	1.4
***************
*** 46,49 ****
--- 46,50 ----
  
  	public:
+ 		int numrendering;
  		renderGL(world *inWorld, object *player) : renderCubes(inWorld, player)
  		{	
***************
*** 72,75 ****
--- 73,152 ----
  };
  
+ 
+ class OcculludeTable { // {{{
+ 	friend class renderGL;
+ 	friend class world;
+ 	class ocMe {
+ 		friend class OcculludeTable;
+ 		friend class std::vector<ocMe>;
+ 		OcculludeTable *thisone;
+ 	};
+ 	static std::vector<ocMe> listofall;
+ 	static OcculludeTable *activetable;
+ 	static world *World;
+ 	vec mypos;
+     // Occullusion Cells {{{
+ 	OcculludeTable *up;
+ 	OcculludeTable *down;
+ 	OcculludeTable *right;
+ 	OcculludeTable *left;
+ 	OcculludeTable *front;
+ 	OcculludeTable *back;
+     // }}}
+ 
+ 	enum { UP, DOWN, LEFT, RIGHT, FRONT, BACK };
+     //each of these is + or - 45 on the X, Y, or Z
+ 	OcculludeTable(world *in);
+ 	OcculludeTable(const OcculludeTable &in);
+ 	OcculludeTable(OcculludeTable &in, int dir);
+ 	~OcculludeTable();
+ 	void cleanup();
+ 	void nullify(OcculludeTable *in);
+ 
+ 	void setPos(int dir, OcculludeTable *from);
+ 	void setDir(int dir, OcculludeTable *in);
+ 	void connectCells(int dir, OcculludeTable *othercell);
+ 	int opposite(int in);
+ 	OcculludeTable *getDir(int in);
+ 	class obj { // {{{
+ 		friend class renderGL;
+ 		friend class OcculludeTable;
+ 		friend class std::vector<obj>;
+ 		bool isoculled;
+ 		object *ojt; //poll this for a list of vertice's.
+ 		world::anObject *worldobject;
+ 		bool operator>(int what) {
+ 			if(what > x || what > y || what > z) return true;
+ 			else return false;
+ 		}
+ 		float x, y, z;
+ 	}; // }}}
+ 
+ 	std::vector<obj> objs;
+ 
+ 	vec getPositionInCell(object *what);
+ 	bool isOcculluded(object *in);
+ 	vec getOffset(vec &pos1, vec &pos2);
+ 	bool tryCreateNewCell(vec position);
+ 	bool moveToAnotherCell(obj *in, int dir);
+ 	void testMoveCell(obj *in);
+ 	void actuallyMove(obj &in, vec &offset);
+ 	void moveObject(object *in, vec &offset);
+ 	void addObject(object *in);
+ 	bool isInRange(int &dir, obj &base);
+ 	template<class T>
+ 	void retranslate(T *what2trans, int dir);
+ 	bool viewportTest(obj looking, vec way, object testagainst);
+ 	std::vector<obj> extraHiddenSurfaceRemoval(obj looking, vec way, std::vector<obj> &potentials);
+ 	class occHelper {
+ 		friend class OcculludeTable;
+ 		std::vector<OcculludeTable *> testedcell;
+ 		std::vector<obj> translatedobjs;
+ 	};
+ 	bool cellsBeenTested(occHelper &in, OcculludeTable *table);
+ 	std::vector<obj> getCloseObjectsFrom(object *in);
+ };// }}}
+ 
+ 
  #endif
  

Index: vObject.h
===================================================================
RCS file: /cvsroot/namc/newengine/vObject.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** vObject.h	25 Oct 2005 04:14:49 -0000	1.4
--- vObject.h	5 Nov 2005 07:18:55 -0000	1.5
***************
*** 40,44 ****
  #endif
  #ifdef HAVE_LIBSDL_MIXER
! #include <SDL_mixer.h>
  #else
  #error You don't have SDL_MIXER installed!, www.libsdl.org/projects/sdl_mixer I think
--- 40,44 ----
  #endif
  #ifdef HAVE_LIBSDL_MIXER
! #include <SDL/SDL_mixer.h>
  #else
  #error You don't have SDL_MIXER installed!, www.libsdl.org/projects/sdl_mixer I think

Index: worldsheet.cpp
===================================================================
RCS file: /cvsroot/namc/newengine/worldsheet.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** worldsheet.cpp	25 Oct 2005 04:14:49 -0000	1.8
--- worldsheet.cpp	5 Nov 2005 07:18:55 -0000	1.9
***************
*** 1,5 ****
--- 1,27 ----
  #include "worldsheet.h"
+ #include "renderGL.h"
+ extern OcculludeTable *Occtable;
  int lastmillis; //just holds the last sdl_tick 
  VAR(maxroll, 0, 3, 20);
+ world::world(int factor) {
+ 	setupWorld(factor);
+ 	physicsfraction = physicsrepeat = 0;
+ 	std::cout << "World Created\n";
+ //              glGetIntegerv(GL_MAX_TEXTURE_SIZE, &glmaxtexsize);
+ //              The above is called AFTER the renderGL object is created
+ //                      purgetextures();
+ 	curtex = FIRSTTEX;
+ 	curtexnum = FIRSTTEX;
+ 	mapmodelreset();
+ 	modelnum = 0;
+ 	Occtable = new OcculludeTable(this);
+ 
+ }
+ world::~world() {
+ 	clearAllObjects();
+ 	std::cout << "World destroyed\n";
+ 	Occtable->cleanup();
+ 	delete Occtable;
+ }
  // findObject by name (char *name) {{{
  object *world::findObject(char *name) {
***************
*** 30,33 ****
--- 52,59 ----
  			iter < worldVector.end(); iter++ ) {
  			if((*(iter))->pt2Object == obj) {
+ //				vec realpos(Occtable->getPositionInCell(obj));
+ //				(*(iter))->x = realpos.x;
+ //				(*(iter))->y = realpos.y;
+ //				(*(iter))->z = realpos.z;
  				return (*(iter));
  			}
***************
*** 58,61 ****
--- 84,88 ----
  	std::string name2add = ptr->getName();
  	float defaultGrav = 0;
+ 	
  //	for(size_t iter = 0; iter < worldVector.size() ;iter++ ) {
  //		anObject newPtr = worldVector.at(iter);
***************
*** 78,81 ****
--- 105,109 ----
  	oneToAdd->defaultGravity = defaultGrav;
  	worldVector.push_back(oneToAdd);
+ 	Occtable->addObject(ptr);
  	return true;
  };
***************
*** 97,102 ****
  	oneToAdd->z = z_in;
  	oneToAdd->defaultGravity = defaultGrav;
! 
!         worldVector.push_back(oneToAdd);
  	return true;
  };
--- 125,130 ----
  	oneToAdd->z = z_in;
  	oneToAdd->defaultGravity = defaultGrav;
! 	worldVector.push_back(oneToAdd);
! 	Occtable->addObject(ptr_in);
  	return true;
  };
***************
*** 243,246 ****
--- 271,275 ----
  	e->y += d.y;
  	e->z += d.z;
+ 	Occtable->moveObject(e->pt2Object, d);
  };
  // }}}
***************
*** 629,634 ****
--- 658,665 ----
  };
  // }}}
+ //Cube textures and mapmodel loading
  //add map model {{{
  void world::addmapmodel(const char *d[]) {
+ //change to std::vector<std::string *> *
  //std::cout << "Map model added" << d[5];
  char *d1 = const_cast<char *>(d[1]);

Index: command.cpp
===================================================================
RCS file: /cvsroot/namc/newengine/command.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** command.cpp	14 Oct 2005 06:08:20 -0000	1.9
--- command.cpp	5 Nov 2005 07:18:55 -0000	1.10
***************
*** 274,284 ****
  	if(y < std::string::npos) {
  		std::cout << "Comment\n"; std::cout.flush();
! 		size_t end = incommand->size() - y -1;
  		incommand->replace(y, end, "");
! 		if(incommand->size() == 1 && static_cast<int>((*(incommand))[0]) == 13 ) { 
! 
! 		incommand->erase();
  		}
! 		if( incommand->size() <= 1) return false;
  	}
      //************ try to replace erase leading space if there is one
--- 274,283 ----
  	if(y < std::string::npos) {
  		std::cout << "Comment\n"; std::cout.flush();
! 		unsigned int end = incommand->size() - y;
  		incommand->replace(y, end, "");
! 		if(incommand->size() == 1 && incommand->compare(" ") == 0 ) { 
! 			incommand->erase();
  		}
! 		if( incommand->size() < 1) return false;
  	}
      //************ try to replace erase leading space if there is one
***************
*** 772,812 ****
  void commandI::exec(char *cfgfile)
  {
  	std::string filedata;
  	filedata.append(Utils.readFile(cfgfile));
! 	std::string newlinem;
! 	newlinem.append("\r\n");
! 	size_t lastnewl = 0;
! 	size_t newl = filedata.find(newlinem);
! 	if(newl == std::string::npos) {
! 		newlinem.erase();
! 		newlinem.append("\r\n");
! 		newl = filedata.find(newlinem);
! 		if(newl == std::string::npos) {
! 			execute((std::string *)(&filedata), true);
! 			return;
  		}
  	}
  //	for(std::string::size_type st=0,en=0; (en=filedata.find("\r\n",st),(st!=std::string::npos)); st=(en!=std::string::npos)?en+1:std::string::npos) {
! 	std::string::size_type last = 0, next = 0;
! 	next=filedata.find(newlinem);
! 	while(next < std::string::npos) {
! 		std::string part;
! 		std::ostringstream fuckingwork;
! 		while(last <= next) {
! 			fuckingwork << filedata[last];
! 			last++;
! 		}
! 		part.append(fuckingwork.str());
! 		if(part.size() <= 0) ;
! 		else {
! 			execute(&part, true);
! 		}
!         last = next+newlinem.size();
!         next = filedata.find(newlinem, next+1);
! 		while(last == next) {
! 			last = next+2;
! 			next = filedata.find(newlinem, next+1);
! 		}
! 	}
  };
  
--- 771,813 ----
  void commandI::exec(char *cfgfile)
  {
+ 	
  	std::string filedata;
  	filedata.append(Utils.readFile(cfgfile));
! 
! 	std::string worker;
! 	std::string::const_iterator end = filedata.end();
! 	std::string::const_iterator scroller = filedata.begin();
! 	for(; scroller < end; scroller++) {
! 		if(*scroller=='\r') continue;
! 		else if(*scroller=='\n') {
! 			execute(&worker, true);
! 			worker.erase();
  		}
+ 		else worker += *scroller;
  	}
+ 	if(worker.size() > 0) execute(&worker, true);
+ 
  //	for(std::string::size_type st=0,en=0; (en=filedata.find("\r\n",st),(st!=std::string::npos)); st=(en!=std::string::npos)?en+1:std::string::npos) {
! //	std::string::size_type last = 0, next = 0;
! //	next=filedata.find(newlinem);
! //	while(next < std::string::npos) {
! //		std::string part;
! //		std::ostringstream fuckingwork;
! //		while(last <= next) {
! //			fuckingwork << filedata[last];
! //			last++;
! //		}
! //		part.append(fuckingwork.str());
! //		if(part.size() <= 0) ;
! //		else {
! ///			execute(&part, true);
! //		}
! //        last = next+newlinem.size();
! //        next = filedata.find(newlinem, next+1);
! //		while(last == next) {
! //			last = next+2;
! //			next = filedata.find(newlinem, next+1);
! //		}
! //	}
  };
  

Index: worldsheet.h
===================================================================
RCS file: /cvsroot/namc/newengine/worldsheet.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** worldsheet.h	14 Oct 2005 02:52:17 -0000	1.4
--- worldsheet.h	5 Nov 2005 07:18:55 -0000	1.5
***************
*** 121,136 ****
  	public:
  //Create the world
! 		world(int factor) {
! 			setupWorld(factor);
! 			physicsfraction = physicsrepeat = 0;
! 			 std::cout << "World Created\n";
! //		glGetIntegerv(GL_MAX_TEXTURE_SIZE, &glmaxtexsize);
! //		The above is called AFTER the renderGL object is created
! //			purgetextures();
! 			curtex = FIRSTTEX;
! 			curtexnum = FIRSTTEX;	
! 			mapmodelreset();
! 			modelnum = 0;
! 		};
  		world(object o, int fac) {std::cout << "World inherited\n"; initWorld(o, fac);}; //run a world loop in a thread };
  
--- 121,125 ----
  	public:
  //Create the world
! 		world(int factor);
  		world(object o, int fac) {std::cout << "World inherited\n"; initWorld(o, fac);}; //run a world loop in a thread };
  
***************
*** 139,143 ****
  			purgetextures();
  		};
! 		~world() { clearAllObjects(); std::cout << "World destroyed\n"; };
  		std::vector<anObject *> worldVector; //initialize an empty vector
  		object *findObject(char *name);
--- 128,132 ----
  			purgetextures();
  		};
! 		~world();
  		std::vector<anObject *> worldVector; //initialize an empty vector
  		object *findObject(char *name);

[Namc-developer] Lighting Problem in OpenGl

[Balaji G <bal...@gm...>]

Hi Mathew

To solve the Lighting Problem using OpenGL,people in OpenGL irc
proposed a solution. The proposed solution is that the Closest 8
lights for each object that needs to be drawn on the screen should be
picked.Do you get some idea on this ? Though i didnt understand  it
fully :-)

You could access the following link to download this Red Book which
has information on OpenGL APIs

http://shadowconflict.com/opengl.html

Regards
Balaji

[Namc-developer] newengine/autom4te.cache output.0,1.2,NONE output.1,1.2,NONE output.2,1.1.1.1,NONE requests,1.4,NONE traces.0,1.2,NONE traces.1,1.2,NONE traces.2,1.1.1.1,NONE

[Matthew <rog...@us...>]

Update of /cvsroot/namc/newengine/autom4te.cache
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6104/autom4te.cache

Removed Files:
	output.0 output.1 output.2 requests traces.0 traces.1 traces.2 
Log Message:
Removed autom4te, finally


--- output.1 DELETED ---

--- output.0 DELETED ---

--- output.2 DELETED ---

--- traces.0 DELETED ---

--- traces.1 DELETED ---

--- traces.2 DELETED ---

--- requests DELETED ---

[Namc-developer] newengine aclocal.m4,1.1.1.1,NONE stamp-h1,1.1.1.1,NONE

[Matthew <rog...@us...>]

Update of /cvsroot/namc/newengine
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5841

Removed Files:
	aclocal.m4 stamp-h1 
Log Message:
Removed files


--- aclocal.m4 DELETED ---

--- stamp-h1 DELETED ---

[Namc-developer] newengine music.cpp,NONE,1.1 music.h,NONE,1.1 Makefile.am,1.3,1.4 main.cpp,1.1.1.1,1.2 sauerbcube.cpp,1.3,1.4 shapes.cpp,1.1.1.1,1.2 tools.h,1.11,1.12 vObject.h,1.3,1.4 worldsheet.cpp,1.7,1.8

[Matthew <rog...@us...>]

Update of /cvsroot/namc/newengine
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5122

Modified Files:
	Makefile.am main.cpp sauerbcube.cpp shapes.cpp tools.h 
	vObject.h worldsheet.cpp 
Added Files:
	music.cpp music.h 
Log Message:
Started adding Balajig's music player 


Index: tools.h
===================================================================
RCS file: /cvsroot/namc/newengine/tools.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** tools.h	14 Oct 2005 06:08:20 -0000	1.11
--- tools.h	25 Oct 2005 04:14:49 -0000	1.12
***************
*** 2,5 ****
--- 2,6 ----
  #else
  #define TOOLS_INC 1
+ #include <malloc.h> // fix bug on buggy g++ compilers
  //#define //DEBUG
  /*
***************
*** 103,106 ****
--- 104,114 ----
  			return false;
  	}
+ 	bool ab( vec &two) { //about equals
+ 			vec comb(x+two.x, y+two.y, z+two.z);
+ 			//if x is less than one, and not less than -1
+ 			// same for y and z
+ 			if( (x < 1 && x > -1) && ( y < 1 && y > -1 ) && ( z < 1 && z >-1) ) return true;
+ 			return false; 
+ 	}
  	bool compare(const vec &in) { 
  		if(x == in.x && y == in.y && z == in.z) return true;

Index: main.cpp
===================================================================
RCS file: /cvsroot/namc/newengine/main.cpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** main.cpp	29 Sep 2005 19:02:33 -0000	1.1.1.1
--- main.cpp	25 Oct 2005 04:14:49 -0000	1.2
***************
*** 66,69 ****
--- 66,70 ----
  }
  
+ localPlayer *lplayer;
  int main()
  {
***************
*** 80,84 ****
  //	addObj(World, temp, 70);
  //	addObj(World, test, 90);
! 	localPlayer *lplayer = new localPlayer(World);
  	World->addObject((object *)lplayer, "monster/ogro");
  /*
--- 81,85 ----
  //	addObj(World, temp, 70);
  //	addObj(World, test, 90);
! 	lplayer = new localPlayer(World);
  	World->addObject((object *)lplayer, "monster/ogro");
  /*

Index: sauerbcube.cpp
===================================================================
RCS file: /cvsroot/namc/newengine/sauerbcube.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** sauerbcube.cpp	14 Oct 2005 03:09:07 -0000	1.3
--- sauerbcube.cpp	25 Oct 2005 04:14:49 -0000	1.4
***************
*** 1,4 ****
--- 1,8 ----
  #include "command.h"
  #include "worldsheet.h"
+ // I expect this class will change a lot, with functions being added and
+ // changed often, which is why there is no header file for it. Once it's in
+ // a working condition and fully supported, a header can be made to keep in
+ // style.
  extern world *worldGlobal;
  class sauerbcube : public commandI {
***************
*** 30,34 ****
  			in->setDir(dir, this);
  		} // }}}
! 		int opposite(int dir) { // {{{
  			if(dir == UP) return DOWN;
  			if(dir == DOWN) return UP;
--- 34,38 ----
  			in->setDir(dir, this);
  		} // }}}
! 		int opposite(int dir) { // {{{ move to private
  			if(dir == UP) return DOWN;
  			if(dir == DOWN) return UP;
***************
*** 48,52 ****
  			if(dir == BACK) return back;
  		} // }}}
! 		void setDir(int dir, sauerbcube *to) { // {{{
  			if(dir == BEGIN) {
  				begin = to;
--- 52,56 ----
  			if(dir == BACK) return back;
  		} // }}}
! 		void setDir(int dir, sauerbcube *to) { // {{{ move to private
  			if(dir == BEGIN) {
  				begin = to;
***************
*** 65,69 ****
  			}
  		} // }}}
! 		void nullify() { // {{{
  			begin = NULL;
  			up = NULL;
--- 69,73 ----
  			}
  		} // }}}
! 		void nullify() { // {{{ move to private
  			begin = NULL;
  			up = NULL;
***************
*** 82,94 ****
  	};
  	std::vector<cubeholder> visiblecubes;
! 	bool ocullMe(object *them) {
! 		return false;
! 		//build a list of visible cubes from the players position (them)
  		
  	}
  	void renderthis(vec &light, float X, float Y, float Z, float YAW, float PITCH, float ROLL, int tex) {
  		return; // render cubes visible in the viewset.
  	}
  
  };
  
--- 86,256 ----
  	};
  	std::vector<cubeholder> visiblecubes;
! 	class cubesss {
! 		friend class sauerbcube;
! 		friend class std::vector<cubesss>;
! 		//this class holds a single face of a cube. build with buildCube()
! 		vec normal;
! 		vec point1;
! 		vec point2;
! 		vec point3;
! 		vec point4;
! 	};
! 	std::vector<cubesss> listoc; //list of cubes
! 	void buildCube() { //build  listoc {{{
! 		for(int mi = 0; mi < 6; mi++) {
! 			if( mi == 0) {
! 				vec normal(0, 0, 1);
! 				cubesss x;
! 				x.normal = normal;
! 				x.point1.z = 1;
! 				x.point2.z = 1;
! 				x.point3.z = 1;
! 				x.point4.z = 1;
! 				
! 				x.point1.y = 1;
! 				x.point1.x = 1;
! 				x.point2.y = -1;
! 				x.point2.x = -1;
! 				x.point3.y = 1;
! 				x.point3.x = -1;
! 				x.point4.y = -1;
! 				x.point4.x = 1;
! 
! 				listoc.push_back(x);
! 			} else if( mi == 1) {
! 				vec normal(0, 0, -1);
! 				cubesss x;
! 				x.normal = normal;
! 				x.point1.z = -1;
! 				x.point2.z = -1;
! 				x.point3.z = -1;
! 				x.point4.z = -1;
! 				
! 				x.point1.y = 1;
! 				x.point1.x = 1;
! 				x.point2.y = -1;
! 				x.point2.x = -1;
! 				x.point3.y = 1;
! 				x.point3.x = -1;
! 				x.point4.y = -1;
! 				x.point4.x = 1;
! 				listoc.push_back(x);
! 			} else if(mi == 2) {
! 				vec normal(0, 1, 0);
! 				cubesss x;
! 				x.normal = normal;
! 
! 				x.point1.y = 1;
! 				x.point2.y = 1;
! 				x.point3.y = 1;
! 				x.point4.y = 1;
! 
! 				x.point1.z = -1;
! 				x.point1.x = 1;
! 				x.point2.z = 1;
! 				x.point2.x = 1;
! 				x.point3.z = -1;
! 				x.point3.x = -1;
! 				x.point4.z = 1;
! 				x.point4.z = -1;
! 
! 				listoc.push_back(x);
! 			} else if(mi == 3) {
! 				vec normal(0, -1, 0);
! 				cubesss x;
! 				x.normal = normal;
! 				x.point1.y = -1;
! 				x.point2.y = -1;
! 				x.point3.y = -1;
! 				x.point4.y = -1;
! 
! 				x.point1.z = 1;
! 				x.point1.x = 1;
! 				x.point2.z = -1;
! 				x.point2.x = -1;
! 				x.point3.z = 1;
! 				x.point3.x = -1;
! 				x.point4.z = -1;
! 				x.point4.x = 1;
! 				listoc.push_back(x);
! 			} else if(mi == 4) {
! 				vec normal(1, 0, 0);
! 				cubesss x;
! 				x.normal = normal;
! 				x.point1.x =  1;
! 				x.point2.x =  1;
! 				x.point3.x =  1;
! 				x.point4.x =  1;
! 				x.point1.y = 1;
! 				x.point1.z = 1;
! 				x.point2.y = -1;
! 				x.point2.z = -1;
! 				x.point3.y = 1;
! 				x.point3.x = -1;
! 				x.point4.y = -1;
! 				x.point4.x = 1;
! 				listoc.push_back(x);
! 			} else if(mi == 5) {
! 				vec normal(-1, 0, 0);
! 				cubesss x;
! 				x.normal = normal;
! 				x.point1.x = -1;
! 				x.point2.x = -1;
! 				x.point3.x = -1;
! 				x.point4.x = -1;
! 
! 				x.point1.y = 1;
! 				x.point1.x = 1;
! 				x.point2.y = -1;
! 				x.point2.x = -1;
! 				x.point3.y = 1;
! 				x.point3.x = -1;
! 				x.point4.y = -1;
! 				x.point4.x = 1;
! 				listoc.push_back(x);
! 
! 			}
! 		}
! 	} // }}}
!     sauerbcube * getClosest(vec from) {
! 		//ok, now I can get the distance from each points, add the total together
! 		//whichever face has the least total distance must be the one?
! 		return NULL; 
! 	}	
! 	bool collideMe(object *them, vec mevec, vec themvec, int curtime) {
! //why did I add curtime to this.. 
! 		//first, if they are further than 2 total distance .. they arn't hitting us, assuming we were just one single cube....
! 		if(worldGlobal->getDistance(this, them) > 2) return false;
! 		vec test(worldGlobal->getDistancev(this, them));
! 		vec normal(0, 0, 1); //start with forward
  		
+ /*
+ 001 forward
+ 00-1 back
+ 010 up
+ 0-10 down
+ 100 right
+ -100 left
+ */
+ 		return true;
+ 		//build a list of visible cubes from the players position (them)
  	}
+ 
  	void renderthis(vec &light, float X, float Y, float Z, float YAW, float PITCH, float ROLL, int tex) {
  		return; // render cubes visible in the viewset.
  	}
  
+ 
+ 	void pullorpush(int pOp, vec pos, vec mypos) { //0 = pull, 1 = push //based on where player is standing
+ 		if(pOp == 0) {
+ 			
+ 		} else if( pOp == 1) {
+ 
+ 		}
+ 		return;
+ 	}
+ 
+ 
+ 
  };
  

Index: Makefile.am
===================================================================
RCS file: /cvsroot/namc/newengine/Makefile.am,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Makefile.am	14 Oct 2005 02:23:52 -0000	1.3
--- Makefile.am	25 Oct 2005 04:14:49 -0000	1.4
***************
*** 1,4 ****
  noinst_PROGRAMS = gravsim
! gravsim_SOURCES = SShapes.cpp shapes.cpp rendertext.cpp worldsheet.cpp renderGL.cpp main.cpp localPlayer.cpp tools.cpp command.cpp md2.cpp sauerbcube.cpp 
  gravsim_LDADD = 
  gravsim_LDFLAGS = `sdl-config --libs` -lSDL_image -lSDL_mixer -lz -lGL
--- 1,4 ----
  noinst_PROGRAMS = gravsim
! gravsim_SOURCES = SShapes.cpp shapes.cpp rendertext.cpp worldsheet.cpp renderGL.cpp main.cpp localPlayer.cpp tools.cpp command.cpp md2.cpp sauerbcube.cpp music.cpp 
  gravsim_LDADD = 
  gravsim_LDFLAGS = `sdl-config --libs` -lSDL_image -lSDL_mixer -lz -lGL

Index: vObject.h
===================================================================
RCS file: /cvsroot/namc/newengine/vObject.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** vObject.h	14 Oct 2005 02:52:17 -0000	1.3
--- vObject.h	25 Oct 2005 04:14:49 -0000	1.4
***************
*** 37,41 ****
  #include <SDL_image.h>
  #else
! #error You don't have SDL_IMAGE installed, www.libsdl.org/sdl_image I think
  #endif
  #ifdef HAVE_LIBZ
--- 37,46 ----
  #include <SDL_image.h>
  #else
! #error You don't have SDL_IMAGE installed, www.libsdl.org/projects/sdl_image I think
! #endif
! #ifdef HAVE_LIBSDL_MIXER
! #include <SDL_mixer.h>
! #else
! #error You don't have SDL_MIXER installed!, www.libsdl.org/projects/sdl_mixer I think
  #endif
  #ifdef HAVE_LIBZ

Index: shapes.cpp
===================================================================
RCS file: /cvsroot/namc/newengine/shapes.cpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** shapes.cpp	29 Sep 2005 19:02:33 -0000	1.1.1.1
--- shapes.cpp	25 Oct 2005 04:14:49 -0000	1.2
***************
*** 13,26 ****
  return false;
  };
! 
  bool cube::collideMe(object *e_in, vec me, vec them, int curtime) 
  {
  	if(me.x == them.x && me.y == them.y && me.z == them.z) return true;
  		//definitally collided
! 	float dist = posExp( ( posExp( me.x-them.x , 2 ) )+( posExp( me.y-them.y , 2 ) ) + ( posExp( me.z-them.z , 2 ) ) , 2 );
! 	dist = sqrt(dist);
! 	if(dist < ( getRad()+e_in->getRad() ) ) { //possible circular collision
! 		return true;
! 	} //need to check vec them against the planes of this object
  return false;
  };
--- 13,29 ----
  return false;
  };
! extern world *worldGlobal;
  bool cube::collideMe(object *e_in, vec me, vec them, int curtime) 
  {
  	if(me.x == them.x && me.y == them.y && me.z == them.z) return true;
  		//definitally collided
! 	if(worldGlobal->getDistance(this, e_in) > 2) return false;
! 	
! 	return true;
! //	float dist = posExp( ( posExp( me.x-them.x , 2 ) )+( posExp( me.y-them.y , 2 ) ) + ( posExp( me.z-them.z , 2 ) ) , 2 );
! //	dist = sqrt(dist);
! //	if(dist < ( getRad()+e_in->getRad() ) ) { //possible circular collision
! //		return true;
! //	} //need to check vec them against the planes of this object
  return false;
  };
***************
*** 377,381 ****
  // Illusion {{{
  // Collision detection {{{
! extern world *worldGlobal;
  bool illusion::collideMe(object *e_in, vec me, vec them, int curtime) {
  	if(e_in->type == TYPE_ILLUSION) {
--- 380,384 ----
  // Illusion {{{
  // Collision detection {{{
! 
  bool illusion::collideMe(object *e_in, vec me, vec them, int curtime) {
  	if(e_in->type == TYPE_ILLUSION) {

Index: worldsheet.cpp
===================================================================
RCS file: /cvsroot/namc/newengine/worldsheet.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** worldsheet.cpp	7 Oct 2005 05:09:57 -0000	1.7
--- worldsheet.cpp	25 Oct 2005 04:14:49 -0000	1.8
***************
*** 172,178 ****
  	anObject *ob2 = getObject(obj2);
  	vec distance;
! 	distance.x = (ob1->x + ob2->x)/2;
! 	distance.y = (ob1->y + ob2->y)/2;
! 	distance.z = (ob1->z + ob2->z)/2;
  	return distance;
  }
--- 172,181 ----
  	anObject *ob2 = getObject(obj2);
  	vec distance;
! 	float x = ob1->x - ob2->x;
! 	float y = ob1->y - ob2->y;
! 	float z = ob1->z - ob2->z;
! 	distance.x = x;//posExp(x, 2);
! 	distance.y = y;//posExp(y, 2);
! 	distance.z = z;//posExp(z, 2);
  	return distance;
  }
***************
*** 190,200 ****
  	float d;
  	if(obj1->x != obj2->x ) {
! 		x = posExp((obj1->x-obj2->x), 2);
  	} else x = 1;
  	if(obj1->y != obj2->y ){
! 		y = posExp((obj1->y-obj2->y), 2);
  	} else y = 1;
  	if(obj1->z != obj2->z ){
! 		z = posExp((obj1->z-obj2->z), 2); 
  	} else z = 1;
  		d = posExp((x+y+z), 2);
--- 193,206 ----
  	float d;
  	if(obj1->x != obj2->x ) {
! //		x = posExp((obj1->x-obj2->x), 2);
! 		x = obj1->x - obj2->x;
  	} else x = 1;
  	if(obj1->y != obj2->y ){
! //		y = posExp((obj1->y-obj2->y), 2);
! 		y = obj2->y - obj2->y;
  	} else y = 1;
  	if(obj1->z != obj2->z ){
! //		z = posExp((obj1->z-obj2->z), 2); 
! 		z = obj1->z - obj2->z;
  	} else z = 1;
  		d = posExp((x+y+z), 2);

--- NEW FILE: music.h ---
#ifdef MUSIC_INC
#else
#define MUSIC_INC 1

#include "localPlayer.h"

class MusicPlayer : public object { //it inherits object so it can be added to the world, eventually, so it can render itself and interact with the world
		//variables
		Mix_Music *music; 
		//Mix_Music will hold the music information
		int audio_rate;
		Uint16 audio_format;
		int audio_channels;
		int audio_buffers;
		static MusicPlayer* instance;
		// run this threaded if the file loads
		void play();
	public:
		MusicPlayer();
		~MusicPlayer();
		void loadSong(std::vector<std::string *> *in);
};

#endif

--- NEW FILE: music.cpp ---
#include <ctime>
#include "SDL_mixer.h"
#include "SDL_thread.h"
#include "music.h"

extern world *worldGlobal;
extern localPlayer *lplayer;

MusicPlayer::MusicPlayer() {
	music = NULL;
	audio_rate = 22050;
	audio_format = AUDIO_S16;
	audio_channels = 2;
	audio_buffers = 4096;
	SDL_Init(SDL_INIT_AUDIO);
	if(Mix_OpenAudio(audio_rate,audio_format,audio_channels,audio_buffers) == 1) {
		lplayer->conoutf("Error opening audio device!\n");
	} else {
		Functor<MusicPlayer> *ls = new Functor<MusicPlayer>(this, &MusicPlayer::loadSong);
		lplayer->addCommand(ls, "loadsong", ARG_1STRVEC);
	}	

}
MusicPlayer::~MusicPlayer() {
        Mix_CloseAudio();
//        SDL_Quit();
        std::cout<<"Destructor called..... everything freed properly "<<std::endl;
}
void MusicPlayer::loadSong(std::vector<std::string *> *in) {
	std::vector<std::string *>::iterator iter = in->begin();
	iter++;
	if(iter >= in->end()) {
		lplayer->conoutf("I need a filename to munch!");
		return;
	}
        music = Mix_LoadMUS((*(iter))->c_str());
        if(music == NULL)
        {
                std::string out;
		out.append(Mix_GetError());
		lplayer->conoutf(out);
                return;
        }
	play();
}
void MusicPlayer::play() {
        if(Mix_PlayMusic(music,0) == 1)
        {
		std::string out;
		out.append("Mix_PlayMusic: ");
		out.append(Mix_GetError());
		lplayer->conoutf(out);
//                cout<<"Mix_PlayMusic"<<Mix_GetError()<<endl;
        }
        return;
}

[Namc-developer] newengine/autom4te.cache requests,1.3,1.4

[Matthew <rog...@us...>]

Update of /cvsroot/namc/newengine/autom4te.cache
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5122/autom4te.cache

Modified Files:
	requests 
Log Message:
Started adding Balajig's music player 


Index: requests
===================================================================
RCS file: /cvsroot/namc/newengine/autom4te.cache/requests,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** requests	14 Oct 2005 02:23:52 -0000	1.3
--- requests	25 Oct 2005 04:14:49 -0000	1.4
***************
*** 31,51 ****
                          'm4_pattern_forbid' => 1,
                          'AC_CONFIG_LIBOBJ_DIR' => 1,
-                         'AC_C_VOLATILE' => 1,
                          'AC_TYPE_OFF_T' => 1,
                          'AC_FUNC_CLOSEDIR_VOID' => 1,
                          'AC_REPLACE_FNMATCH' => 1,
                          'AC_PROG_LIBTOOL' => 1,
-                         'AM_PROG_MKDIR_P' => 1,
                          'AC_FUNC_STAT' => 1,
!                         'AC_FUNC_WAIT3' => 1,
                          'AC_HEADER_TIME' => 1,
!                         'AM_AUTOMAKE_VERSION' => 1,
!                         'AC_FUNC_LSTAT' => 1,
                          'AC_STRUCT_TM' => 1,
!                         'AM_MISSING_HAS_RUN' => 1,
!                         'AC_FUNC_GETMNTENT' => 1,
                          'AC_TYPE_MODE_T' => 1,
!                         'AC_CHECK_HEADERS' => 1,
                          'AC_FUNC_STRTOD' => 1,
                          'AM_MISSING_PROG' => 1,
                          'AC_FUNC_STRNLEN' => 1,
--- 31,51 ----
                          'm4_pattern_forbid' => 1,
                          'AC_CONFIG_LIBOBJ_DIR' => 1,
                          'AC_TYPE_OFF_T' => 1,
+                         'AC_C_VOLATILE' => 1,
                          'AC_FUNC_CLOSEDIR_VOID' => 1,
                          'AC_REPLACE_FNMATCH' => 1,
                          'AC_PROG_LIBTOOL' => 1,
                          'AC_FUNC_STAT' => 1,
!                         'AM_PROG_MKDIR_P' => 1,
                          'AC_HEADER_TIME' => 1,
!                         'AC_FUNC_WAIT3' => 1,
                          'AC_STRUCT_TM' => 1,
!                         'AC_FUNC_LSTAT' => 1,
!                         'AM_AUTOMAKE_VERSION' => 1,
                          'AC_TYPE_MODE_T' => 1,
!                         'AC_FUNC_GETMNTENT' => 1,
!                         'AM_MISSING_HAS_RUN' => 1,
                          'AC_FUNC_STRTOD' => 1,
+                         'AC_CHECK_HEADERS' => 1,
                          'AM_MISSING_PROG' => 1,
                          'AC_FUNC_STRNLEN' => 1,
***************
*** 62,76 ****
                          'AC_FUNC_ERROR_AT_LINE' => 1,
                          'AC_PROG_GCC_TRADITIONAL' => 1,
-                         'AM_DEP_TRACK' => 1,
                          'AC_LIBSOURCE' => 1,
                          'AC_FUNC_MBRTOWC' => 1,
                          'AC_STRUCT_ST_BLOCKS' => 1,
                          'AC_TYPE_SIGNAL' => 1,
-                         '_AM_IF_OPTION' => 1,
                          'AC_TYPE_UID_T' => 1,
!                         'AC_PROG_MAKE_SET' => 1,
                          'AC_CONFIG_AUX_DIR' => 1,
!                         'm4_pattern_allow' => 1,
                          'sinclude' => 1,
                          'AM_SET_LEADING_DOT' => 1,
                          'AC_DEFINE_TRACE_LITERAL' => 1,
--- 62,76 ----
                          'AC_FUNC_ERROR_AT_LINE' => 1,
                          'AC_PROG_GCC_TRADITIONAL' => 1,
                          'AC_LIBSOURCE' => 1,
+                         'AM_DEP_TRACK' => 1,
                          'AC_FUNC_MBRTOWC' => 1,
                          'AC_STRUCT_ST_BLOCKS' => 1,
                          'AC_TYPE_SIGNAL' => 1,
                          'AC_TYPE_UID_T' => 1,
!                         '_AM_IF_OPTION' => 1,
                          'AC_CONFIG_AUX_DIR' => 1,
!                         'AC_PROG_MAKE_SET' => 1,
                          'sinclude' => 1,
+                         'm4_pattern_allow' => 1,
                          'AM_SET_LEADING_DOT' => 1,
                          'AC_DEFINE_TRACE_LITERAL' => 1,
***************
*** 78,85 ****
                          'AC_FUNC_STRERROR_R' => 1,
                          'AC_PROG_CC' => 1,
-                         'AC_DECL_SYS_SIGLIST' => 1,
                          'AC_FUNC_FORK' => 1,
!                         'AC_FUNC_STRCOLL' => 1,
                          'AC_FUNC_VPRINTF' => 1,
                          'AC_PROG_YACC' => 1,
                          'AC_INIT' => 1,
--- 78,85 ----
                          'AC_FUNC_STRERROR_R' => 1,
                          'AC_PROG_CC' => 1,
                          'AC_FUNC_FORK' => 1,
!                         'AC_DECL_SYS_SIGLIST' => 1,
                          'AC_FUNC_VPRINTF' => 1,
+                         'AC_FUNC_STRCOLL' => 1,
                          'AC_PROG_YACC' => 1,
                          'AC_INIT' => 1,
***************
*** 93,104 ****
                          'AC_FUNC_GETPGRP' => 1,
                          'AC_PROG_RANLIB' => 1,
-                         'AC_FUNC_SETPGRP' => 1,
                          'AM_INIT_AUTOMAKE' => 1,
                          'AC_CONFIG_SUBDIRS' => 1,
                          'AC_FUNC_MMAP' => 1,
                          'AC_FUNC_REALLOC' => 1,
                          'AC_TYPE_SIZE_T' => 1,
-                         'AC_CHECK_TYPES' => 1,
                          'AC_CONFIG_LINKS' => 1,
                          'AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
                          'AC_CHECK_MEMBERS' => 1,
--- 93,104 ----
                          'AC_FUNC_GETPGRP' => 1,
                          'AC_PROG_RANLIB' => 1,
                          'AM_INIT_AUTOMAKE' => 1,
+                         'AC_FUNC_SETPGRP' => 1,
                          'AC_CONFIG_SUBDIRS' => 1,
                          'AC_FUNC_MMAP' => 1,
                          'AC_FUNC_REALLOC' => 1,
                          'AC_TYPE_SIZE_T' => 1,
                          'AC_CONFIG_LINKS' => 1,
+                         'AC_CHECK_TYPES' => 1,
                          'AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
                          'AC_CHECK_MEMBERS' => 1,
***************
*** 106,128 ****
                          'AC_FUNC_UTIME_NULL' => 1,
                          'AC_FUNC_SELECT_ARGTYPES' => 1,
-                         'AC_FUNC_STRFTIME' => 1,
                          'AC_HEADER_STAT' => 1,
!                         'AC_C_INLINE' => 1,
                          'AC_PROG_CPP' => 1,
!                         'AC_C_CONST' => 1,
!                         'AC_PROG_LEX' => 1,
                          'AC_TYPE_PID_T' => 1,
                          'AC_CONFIG_FILES' => 1,
                          'include' => 1,
                          'AC_FUNC_SETVBUF_REVERSED' => 1,
-                         'AM_AUX_DIR_EXPAND' => 1,
                          'AC_PROG_INSTALL' => 1,
                          'AM_GNU_GETTEXT' => 1,
-                         'AC_FUNC_OBSTACK' => 1,
                          'AC_CHECK_LIB' => 1,
!                         'AC_FUNC_MALLOC' => 1,
                          '_AM_SET_OPTIONS' => 1,
!                         'AC_FUNC_GETGROUPS' => 1,
                          '_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
                          'AC_FUNC_GETLOADAVG' => 1,
                          'AH_OUTPUT' => 1,
--- 106,128 ----
                          'AC_FUNC_UTIME_NULL' => 1,
                          'AC_FUNC_SELECT_ARGTYPES' => 1,
                          'AC_HEADER_STAT' => 1,
!                         'AC_FUNC_STRFTIME' => 1,
                          'AC_PROG_CPP' => 1,
!                         'AC_C_INLINE' => 1,
                          'AC_TYPE_PID_T' => 1,
+                         'AC_PROG_LEX' => 1,
+                         'AC_C_CONST' => 1,
                          'AC_CONFIG_FILES' => 1,
                          'include' => 1,
                          'AC_FUNC_SETVBUF_REVERSED' => 1,
                          'AC_PROG_INSTALL' => 1,
+                         'AM_AUX_DIR_EXPAND' => 1,
                          'AM_GNU_GETTEXT' => 1,
                          'AC_CHECK_LIB' => 1,
!                         'AC_FUNC_OBSTACK' => 1,
                          '_AM_SET_OPTIONS' => 1,
!                         'AC_FUNC_MALLOC' => 1,
                          '_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
+                         'AC_FUNC_GETGROUPS' => 1,
                          'AC_FUNC_GETLOADAVG' => 1,
                          'AH_OUTPUT' => 1,
***************
*** 130,146 ****
                          'AM_PROG_CC_C_O' => 1,
                          '_AM_MANGLE_OPTION' => 1,
-                         'AC_FUNC_MKTIME' => 1,
-                         'AM_CONDITIONAL' => 1,
                          'AC_CANONICAL_SYSTEM' => 1,
                          'AC_CONFIG_HEADERS' => 1,
                          'AM_SET_DEPDIR' => 1,
                          'AC_HEADER_SYS_WAIT' => 1,
-                         'AC_FUNC_MEMCMP' => 1,
                          'AC_PROG_LN_S' => 1,
!                         'AM_PROG_INSTALL_SH' => 1,
                          'm4_include' => 1,
                          'AC_HEADER_DIRENT' => 1,
-                         '_AC_AM_CONFIG_HEADER_HOOK' => 1,
                          'AC_CHECK_FUNCS' => 1,
                          'AM_MAKE_INCLUDE' => 1
                        }
--- 130,146 ----
                          'AM_PROG_CC_C_O' => 1,
                          '_AM_MANGLE_OPTION' => 1,
                          'AC_CANONICAL_SYSTEM' => 1,
+                         'AM_CONDITIONAL' => 1,
+                         'AC_FUNC_MKTIME' => 1,
                          'AC_CONFIG_HEADERS' => 1,
                          'AM_SET_DEPDIR' => 1,
                          'AC_HEADER_SYS_WAIT' => 1,
                          'AC_PROG_LN_S' => 1,
!                         'AC_FUNC_MEMCMP' => 1,
                          'm4_include' => 1,
+                         'AM_PROG_INSTALL_SH' => 1,
                          'AC_HEADER_DIRENT' => 1,
                          'AC_CHECK_FUNCS' => 1,
+                         '_AC_AM_CONFIG_HEADER_HOOK' => 1,
                          'AM_MAKE_INCLUDE' => 1
                        }
***************
*** 160,176 ****
                          'm4_pattern_forbid' => 1,
                          'AC_CONFIG_LIBOBJ_DIR' => 1,
-                         'AC_TYPE_OFF_T' => 1,
                          'AC_C_VOLATILE' => 1,
                          'AC_FUNC_CLOSEDIR_VOID' => 1,
                          'AC_REPLACE_FNMATCH' => 1,
                          'AC_PROG_LIBTOOL' => 1,
                          'AC_FUNC_STAT' => 1,
-                         'AC_HEADER_TIME' => 1,
                          'AC_FUNC_WAIT3' => 1,
!                         'AM_AUTOMAKE_VERSION' => 1,
!                         'AC_STRUCT_TM' => 1,
                          'AC_FUNC_LSTAT' => 1,
!                         'AC_TYPE_MODE_T' => 1,
                          'AC_FUNC_GETMNTENT' => 1,
                          'AC_FUNC_STRTOD' => 1,
                          'AC_CHECK_HEADERS' => 1,
--- 160,176 ----
                          'm4_pattern_forbid' => 1,
                          'AC_CONFIG_LIBOBJ_DIR' => 1,
                          'AC_C_VOLATILE' => 1,
+                         'AC_TYPE_OFF_T' => 1,
                          'AC_FUNC_CLOSEDIR_VOID' => 1,
                          'AC_REPLACE_FNMATCH' => 1,
                          'AC_PROG_LIBTOOL' => 1,
                          'AC_FUNC_STAT' => 1,
                          'AC_FUNC_WAIT3' => 1,
!                         'AC_HEADER_TIME' => 1,
                          'AC_FUNC_LSTAT' => 1,
!                         'AC_STRUCT_TM' => 1,
!                         'AM_AUTOMAKE_VERSION' => 1,
                          'AC_FUNC_GETMNTENT' => 1,
+                         'AC_TYPE_MODE_T' => 1,
                          'AC_FUNC_STRTOD' => 1,
                          'AC_CHECK_HEADERS' => 1,
***************
*** 191,205 ****
                          'AC_TYPE_SIGNAL' => 1,
                          'AC_TYPE_UID_T' => 1,
-                         'AC_CONFIG_AUX_DIR' => 1,
                          'AC_PROG_MAKE_SET' => 1,
!                         'sinclude' => 1,
                          'm4_pattern_allow' => 1,
                          'AC_DEFINE_TRACE_LITERAL' => 1,
                          'AC_FUNC_STRERROR_R' => 1,
                          'AC_PROG_CC' => 1,
-                         'AC_DECL_SYS_SIGLIST' => 1,
                          'AC_FUNC_FORK' => 1,
!                         'AC_FUNC_VPRINTF' => 1,
                          'AC_FUNC_STRCOLL' => 1,
                          'AC_PROG_YACC' => 1,
                          'AC_INIT' => 1,
--- 191,205 ----
                          'AC_TYPE_SIGNAL' => 1,
                          'AC_TYPE_UID_T' => 1,
                          'AC_PROG_MAKE_SET' => 1,
!                         'AC_CONFIG_AUX_DIR' => 1,
                          'm4_pattern_allow' => 1,
+                         'sinclude' => 1,
                          'AC_DEFINE_TRACE_LITERAL' => 1,
                          'AC_FUNC_STRERROR_R' => 1,
                          'AC_PROG_CC' => 1,
                          'AC_FUNC_FORK' => 1,
!                         'AC_DECL_SYS_SIGLIST' => 1,
                          'AC_FUNC_STRCOLL' => 1,
+                         'AC_FUNC_VPRINTF' => 1,
                          'AC_PROG_YACC' => 1,
                          'AC_INIT' => 1,
***************
*** 223,234 ****
                          'AC_FUNC_UTIME_NULL' => 1,
                          'AC_FUNC_SELECT_ARGTYPES' => 1,
-                         'AC_FUNC_STRFTIME' => 1,
                          'AC_HEADER_STAT' => 1,
!                         'AC_C_INLINE' => 1,
                          'AC_PROG_CPP' => 1,
!                         'AM_ENABLE_MULTILIB' => 1,
!                         'AC_TYPE_PID_T' => 1,
!                         'AC_C_CONST' => 1,
                          'AC_PROG_LEX' => 1,
                          'AC_CONFIG_FILES' => 1,
                          'include' => 1,
--- 223,234 ----
                          'AC_FUNC_UTIME_NULL' => 1,
                          'AC_FUNC_SELECT_ARGTYPES' => 1,
                          'AC_HEADER_STAT' => 1,
!                         'AC_FUNC_STRFTIME' => 1,
                          'AC_PROG_CPP' => 1,
!                         'AC_C_INLINE' => 1,
                          'AC_PROG_LEX' => 1,
+                         'AC_C_CONST' => 1,
+                         'AC_TYPE_PID_T' => 1,
+                         'AM_ENABLE_MULTILIB' => 1,
                          'AC_CONFIG_FILES' => 1,
                          'include' => 1,
***************
*** 236,241 ****
                          'AC_PROG_INSTALL' => 1,
                          'AM_GNU_GETTEXT' => 1,
-                         'AC_CHECK_LIB' => 1,
                          'AC_FUNC_OBSTACK' => 1,
                          'AC_FUNC_MALLOC' => 1,
                          'AC_FUNC_GETGROUPS' => 1,
--- 236,241 ----
                          'AC_PROG_INSTALL' => 1,
                          'AM_GNU_GETTEXT' => 1,
                          'AC_FUNC_OBSTACK' => 1,
+                         'AC_CHECK_LIB' => 1,
                          'AC_FUNC_MALLOC' => 1,
                          'AC_FUNC_GETGROUPS' => 1,
***************
*** 244,254 ****
                          'AC_FUNC_FSEEKO' => 1,
                          'AM_PROG_CC_C_O' => 1,
-                         'AM_CONDITIONAL' => 1,
-                         'AC_CANONICAL_SYSTEM' => 1,
                          'AC_FUNC_MKTIME' => 1,
                          'AC_CONFIG_HEADERS' => 1,
                          'AC_HEADER_SYS_WAIT' => 1,
-                         'AC_FUNC_MEMCMP' => 1,
                          'AC_PROG_LN_S' => 1,
                          'm4_include' => 1,
                          'AC_HEADER_DIRENT' => 1,
--- 244,254 ----
                          'AC_FUNC_FSEEKO' => 1,
                          'AM_PROG_CC_C_O' => 1,
                          'AC_FUNC_MKTIME' => 1,
+                         'AC_CANONICAL_SYSTEM' => 1,
+                         'AM_CONDITIONAL' => 1,
                          'AC_CONFIG_HEADERS' => 1,
                          'AC_HEADER_SYS_WAIT' => 1,
                          'AC_PROG_LN_S' => 1,
+                         'AC_FUNC_MEMCMP' => 1,
                          'm4_include' => 1,
                          'AC_HEADER_DIRENT' => 1,
***************
*** 284,300 ****
                          'AM_ENABLE_STATIC' => 1,
                          'AC_LIBTOOL_LANG_RC_CONFIG' => 1,
-                         'AC_C_VOLATILE' => 1,
                          'AC_TYPE_OFF_T' => 1,
!                         '_LT_AC_SHELL_INIT' => 1,
                          'AC_FUNC_CLOSEDIR_VOID' => 1,
                          'AC_REPLACE_FNMATCH' => 1,
                          '_LT_AC_LANG_CXX_CONFIG' => 1,
                          'AC_PROG_LIBTOOL' => 1,
-                         'AM_PROG_MKDIR_P' => 1,
                          'AC_FUNC_STAT' => 1,
                          'AC_FUNC_WAIT3' => 1,
-                         'AM_AUTOMAKE_VERSION' => 1,
-                         'AC_FUNC_LSTAT' => 1,
                          'AC_STRUCT_TM' => 1,
                          'AC_FUNC_STRTOD' => 1,
                          'AC_CHECK_HEADERS' => 1,
--- 284,300 ----
                          'AM_ENABLE_STATIC' => 1,
                          'AC_LIBTOOL_LANG_RC_CONFIG' => 1,
                          'AC_TYPE_OFF_T' => 1,
!                         'AC_C_VOLATILE' => 1,
                          'AC_FUNC_CLOSEDIR_VOID' => 1,
+                         '_LT_AC_SHELL_INIT' => 1,
                          'AC_REPLACE_FNMATCH' => 1,
                          '_LT_AC_LANG_CXX_CONFIG' => 1,
                          'AC_PROG_LIBTOOL' => 1,
                          'AC_FUNC_STAT' => 1,
+                         'AM_PROG_MKDIR_P' => 1,
                          'AC_FUNC_WAIT3' => 1,
                          'AC_STRUCT_TM' => 1,
+                         'AC_FUNC_LSTAT' => 1,
+                         'AM_AUTOMAKE_VERSION' => 1,
                          'AC_FUNC_STRTOD' => 1,
                          'AC_CHECK_HEADERS' => 1,
***************
*** 319,335 ****
                          'AC_LIBSOURCE' => 1,
                          'AC_STRUCT_ST_BLOCKS' => 1,
-                         '_LT_AC_LANG_F77' => 1,
                          'AC_LIBTOOL_CONFIG' => 1,
!                         'AC_PROG_MAKE_SET' => 1,
                          'AC_CONFIG_AUX_DIR' => 1,
                          'sinclude' => 1,
                          'AM_DISABLE_SHARED' => 1,
-                         '_LT_AC_LANG_CXX' => 1,
                          'AM_PROG_LIBTOOL' => 1,
!                         '_LT_AC_FILE_LTDLL_C' => 1,
                          'AM_PROG_LD' => 1,
                          'AC_FUNC_STRERROR_R' => 1,
-                         'AC_DECL_SYS_SIGLIST' => 1,
                          'AC_FUNC_FORK' => 1,
                          'AC_FUNC_VPRINTF' => 1,
                          'AC_PROG_NM' => 1,
--- 319,335 ----
                          'AC_LIBSOURCE' => 1,
                          'AC_STRUCT_ST_BLOCKS' => 1,
                          'AC_LIBTOOL_CONFIG' => 1,
!                         '_LT_AC_LANG_F77' => 1,
                          'AC_CONFIG_AUX_DIR' => 1,
+                         'AC_PROG_MAKE_SET' => 1,
                          'sinclude' => 1,
                          'AM_DISABLE_SHARED' => 1,
                          'AM_PROG_LIBTOOL' => 1,
!                         '_LT_AC_LANG_CXX' => 1,
                          'AM_PROG_LD' => 1,
+                         '_LT_AC_FILE_LTDLL_C' => 1,
                          'AC_FUNC_STRERROR_R' => 1,
                          'AC_FUNC_FORK' => 1,
+                         'AC_DECL_SYS_SIGLIST' => 1,
                          'AC_FUNC_VPRINTF' => 1,
                          'AC_PROG_NM' => 1,
***************
*** 344,350 ****
                          '_AM_SET_OPTION' => 1,
                          'AC_CANONICAL_HOST' => 1,
                          'AC_LIBTOOL_LANG_CXX_CONFIG' => 1,
                          'AC_PROG_RANLIB' => 1,
-                         'AC_LIBTOOL_PROG_CC_C_O' => 1,
                          'AC_FUNC_SETPGRP' => 1,
                          'AC_CONFIG_SUBDIRS' => 1,
--- 344,350 ----
                          '_AM_SET_OPTION' => 1,
                          'AC_CANONICAL_HOST' => 1,
+                         'AC_LIBTOOL_PROG_CC_C_O' => 1,
                          'AC_LIBTOOL_LANG_CXX_CONFIG' => 1,
                          'AC_PROG_RANLIB' => 1,
                          'AC_FUNC_SETPGRP' => 1,
                          'AC_CONFIG_SUBDIRS' => 1,
***************
*** 357,397 ****
                          'AC_FUNC_SELECT_ARGTYPES' => 1,
                          '_LT_AC_LANG_GCJ' => 1,
-                         'AC_FUNC_STRFTIME' => 1,
                          'AC_HEADER_STAT' => 1,
                          'AC_C_INLINE' => 1,
                          'AC_LIBTOOL_RC' => 1,
-                         '_LT_AC_PROG_ECHO_BACKSLASH' => 1,
                          'AC_DISABLE_FAST_INSTALL' => 1,
                          'AC_CONFIG_FILES' => 1,
-                         '_LT_AC_TRY_DLOPEN_SELF' => 1,
-                         '_LT_AC_SYS_LIBPATH_AIX' => 1,
                          'include' => 1,
                          'LT_AC_PROG_SED' => 1,
                          'AM_ENABLE_SHARED' => 1,
                          'AM_GNU_GETTEXT' => 1,
                          '_LT_AC_LANG_GCJ_CONFIG' => 1,
-                         'AC_ENABLE_SHARED' => 1,
-                         'AC_CHECK_LIB' => 1,
                          'AC_FUNC_OBSTACK' => 1,
                          'AC_FUNC_MALLOC' => 1,
                          'AC_FUNC_GETGROUPS' => 1,
                          'AC_FUNC_GETLOADAVG' => 1,
-                         'AC_LIBTOOL_SYS_HARD_LINK_LOCKS' => 1,
-                         'AC_ENABLE_STATIC' => 1,
                          'AC_FUNC_FSEEKO' => 1,
!                         '_LT_AC_TAGVAR' => 1,
                          'AM_PROG_CC_C_O' => 1,
                          'AC_LIBTOOL_LANG_F77_CONFIG' => 1,
-                         'AM_CONDITIONAL' => 1,
                          'AC_FUNC_MKTIME' => 1,
                          'AC_HEADER_SYS_WAIT' => 1,
-                         'AC_FUNC_MEMCMP' => 1,
                          'AC_PROG_LN_S' => 1,
!                         'AM_PROG_INSTALL_SH' => 1,
                          'm4_include' => 1,
!                         'AC_PROG_EGREP' => 1,
                          'AC_HEADER_DIRENT' => 1,
!                         'AC_PATH_MAGIC' => 1,
                          '_AC_AM_CONFIG_HEADER_HOOK' => 1,
                          'AM_MAKE_INCLUDE' => 1,
                          '_LT_AC_TAGCONFIG' => 1,
--- 357,397 ----
                          'AC_FUNC_SELECT_ARGTYPES' => 1,
                          '_LT_AC_LANG_GCJ' => 1,
                          'AC_HEADER_STAT' => 1,
+                         'AC_FUNC_STRFTIME' => 1,
                          'AC_C_INLINE' => 1,
                          'AC_LIBTOOL_RC' => 1,
                          'AC_DISABLE_FAST_INSTALL' => 1,
+                         '_LT_AC_PROG_ECHO_BACKSLASH' => 1,
                          'AC_CONFIG_FILES' => 1,
                          'include' => 1,
+                         '_LT_AC_SYS_LIBPATH_AIX' => 1,
+                         '_LT_AC_TRY_DLOPEN_SELF' => 1,
                          'LT_AC_PROG_SED' => 1,
                          'AM_ENABLE_SHARED' => 1,
                          'AM_GNU_GETTEXT' => 1,
                          '_LT_AC_LANG_GCJ_CONFIG' => 1,
                          'AC_FUNC_OBSTACK' => 1,
+                         'AC_CHECK_LIB' => 1,
+                         'AC_ENABLE_SHARED' => 1,
                          'AC_FUNC_MALLOC' => 1,
                          'AC_FUNC_GETGROUPS' => 1,
                          'AC_FUNC_GETLOADAVG' => 1,
                          'AC_FUNC_FSEEKO' => 1,
!                         'AC_ENABLE_STATIC' => 1,
!                         'AC_LIBTOOL_SYS_HARD_LINK_LOCKS' => 1,
                          'AM_PROG_CC_C_O' => 1,
+                         '_LT_AC_TAGVAR' => 1,
                          'AC_LIBTOOL_LANG_F77_CONFIG' => 1,
                          'AC_FUNC_MKTIME' => 1,
+                         'AM_CONDITIONAL' => 1,
                          'AC_HEADER_SYS_WAIT' => 1,
                          'AC_PROG_LN_S' => 1,
!                         'AC_FUNC_MEMCMP' => 1,
                          'm4_include' => 1,
!                         'AM_PROG_INSTALL_SH' => 1,
                          'AC_HEADER_DIRENT' => 1,
!                         'AC_PROG_EGREP' => 1,
                          '_AC_AM_CONFIG_HEADER_HOOK' => 1,
+                         'AC_PATH_MAGIC' => 1,
                          'AM_MAKE_INCLUDE' => 1,
                          '_LT_AC_TAGCONFIG' => 1,
***************
*** 413,436 ****
                          'AC_HEADER_STDC' => 1,
                          'AC_LIBTOOL_LINKER_OPTION' => 1,
-                         'LT_AC_PROG_RC' => 1,
                          'AC_LIBTOOL_CXX' => 1,
                          'LT_AC_PROG_GCJ' => 1,
                          'AC_FUNC_ERROR_AT_LINE' => 1,
-                         'AM_DISABLE_STATIC' => 1,
                          'AM_DEP_TRACK' => 1,
!                         'AC_FUNC_MBRTOWC' => 1,
                          '_AC_PROG_LIBTOOL' => 1,
                          'AC_TYPE_SIGNAL' => 1,
-                         '_AM_IF_OPTION' => 1,
                          'AC_TYPE_UID_T' => 1,
                          'AC_PATH_TOOL_PREFIX' => 1,
-                         'm4_pattern_allow' => 1,
                          'AC_LIBTOOL_F77' => 1,
                          'AM_SET_LEADING_DOT' => 1,
                          'AC_DEFINE_TRACE_LITERAL' => 1,
                          '_AM_DEPENDENCIES' => 1,
                          'AC_LIBTOOL_LANG_C_CONFIG' => 1,
-                         '_LT_AC_SYS_COMPILER' => 1,
                          'AC_PROG_CC' => 1,
                          'AM_PROG_NM' => 1,
                          'AC_FUNC_STRCOLL' => 1,
--- 413,436 ----
                          'AC_HEADER_STDC' => 1,
                          'AC_LIBTOOL_LINKER_OPTION' => 1,
                          'AC_LIBTOOL_CXX' => 1,
+                         'LT_AC_PROG_RC' => 1,
                          'LT_AC_PROG_GCJ' => 1,
                          'AC_FUNC_ERROR_AT_LINE' => 1,
                          'AM_DEP_TRACK' => 1,
!                         'AM_DISABLE_STATIC' => 1,
                          '_AC_PROG_LIBTOOL' => 1,
+                         'AC_FUNC_MBRTOWC' => 1,
                          'AC_TYPE_SIGNAL' => 1,
                          'AC_TYPE_UID_T' => 1,
+                         '_AM_IF_OPTION' => 1,
                          'AC_PATH_TOOL_PREFIX' => 1,
                          'AC_LIBTOOL_F77' => 1,
+                         'm4_pattern_allow' => 1,
                          'AM_SET_LEADING_DOT' => 1,
                          'AC_DEFINE_TRACE_LITERAL' => 1,
                          '_AM_DEPENDENCIES' => 1,
                          'AC_LIBTOOL_LANG_C_CONFIG' => 1,
                          'AC_PROG_CC' => 1,
+                         '_LT_AC_SYS_COMPILER' => 1,
                          'AM_PROG_NM' => 1,
                          'AC_FUNC_STRCOLL' => 1,
***************
*** 438,444 ****
                          'AC_LIBLTDL_CONVENIENCE' => 1,
                          'AC_DEPLIBS_CHECK_METHOD' => 1,
-                         'AC_FUNC_CHOWN' => 1,
-                         'AC_LIBLTDL_INSTALLABLE' => 1,
                          'AM_SET_CURRENT_AUTOMAKE_VERSION' => 1,
                          'AC_LIBTOOL_SYS_DYNAMIC_LINKER' => 1,
                          'AC_FUNC_GETPGRP' => 1,
--- 438,444 ----
                          'AC_LIBLTDL_CONVENIENCE' => 1,
                          'AC_DEPLIBS_CHECK_METHOD' => 1,
                          'AM_SET_CURRENT_AUTOMAKE_VERSION' => 1,
+                         'AC_LIBLTDL_INSTALLABLE' => 1,
+                         'AC_FUNC_CHOWN' => 1,
                          'AC_LIBTOOL_SYS_DYNAMIC_LINKER' => 1,
                          'AC_FUNC_GETPGRP' => 1,
***************
*** 451,463 ****
                          '_LT_AC_LANG_RC_CONFIG' => 1,
                          'AC_PROG_CPP' => 1,
-                         'AC_C_CONST' => 1,
-                         'AC_PROG_LEX' => 1,
                          'AC_TYPE_PID_T' => 1,
                          'AC_LIBTOOL_POSTDEP_PREDEP' => 1,
                          'AC_FUNC_SETVBUF_REVERSED' => 1,
-                         'AM_AUX_DIR_EXPAND' => 1,
                          'AC_PROG_INSTALL' => 1,
!                         '_LT_AC_LANG_F77_CONFIG' => 1,
                          'AC_LIBTOOL_PROG_COMPILER_NO_RTTI' => 1,
                          '_AM_SET_OPTIONS' => 1,
                          '_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
--- 451,463 ----
                          '_LT_AC_LANG_RC_CONFIG' => 1,
                          'AC_PROG_CPP' => 1,
                          'AC_TYPE_PID_T' => 1,
+                         'AC_PROG_LEX' => 1,
+                         'AC_C_CONST' => 1,
                          'AC_LIBTOOL_POSTDEP_PREDEP' => 1,
                          'AC_FUNC_SETVBUF_REVERSED' => 1,
                          'AC_PROG_INSTALL' => 1,
!                         'AM_AUX_DIR_EXPAND' => 1,
                          'AC_LIBTOOL_PROG_COMPILER_NO_RTTI' => 1,
+                         '_LT_AC_LANG_F77_CONFIG' => 1,
                          '_AM_SET_OPTIONS' => 1,
                          '_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
***************
*** 468,473 ****
                          '_AM_MANGLE_OPTION' => 1,
                          'AC_CANONICAL_SYSTEM' => 1,
-                         'AC_LIBTOOL_SYS_MAX_CMD_LEN' => 1,
                          'AC_CONFIG_HEADERS' => 1,
                          'AM_SET_DEPDIR' => 1,
                          'AC_CHECK_FUNCS' => 1
--- 468,473 ----
                          '_AM_MANGLE_OPTION' => 1,
                          'AC_CANONICAL_SYSTEM' => 1,
                          'AC_CONFIG_HEADERS' => 1,
+                         'AC_LIBTOOL_SYS_MAX_CMD_LEN' => 1,
                          'AM_SET_DEPDIR' => 1,
                          'AC_CHECK_FUNCS' => 1

[Namc-developer] Hi

[Balaji G <bal...@gm...>]

Test Message ......

Regards
Balaji

[Namc-developer] First message!

[Matthew <rog...@co...>]

WOO! This is the first message on this list! Party on!

-- 
Using Opera's revolutionary e-mail client: http://www.opera.com/m2/