[Once-cvs] oncecode/src/common ocloader.cpp,1.20,1.21 ocnewavatarmsg.cpp,1.1,1.2 ocnewavatarmsg.h,1.1,1.2 ocsettings.cpp,1.4,1.5 ocsettings.h,1.2,1.3

[Manuel A. F. M. <ma...@us...>]

Update of /cvsroot/once/oncecode/src/common
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10714/src/common

Modified Files:
	ocloader.cpp ocnewavatarmsg.cpp ocnewavatarmsg.h 
	ocsettings.cpp ocsettings.h 
Log Message:
Complete race and gender support in code, I'll commit needed data changes in a minute. There's no (uploaded) support in ocuseraccounts yet, it will be in the next days.

Index: ocloader.cpp
===================================================================
RCS file: /cvsroot/once/oncecode/src/common/ocloader.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** ocloader.cpp	15 Nov 2004 07:18:05 -0000	1.20
--- ocloader.cpp	28 Dec 2004 00:41:47 -0000	1.21
***************
*** 98,102 ****
  	if (!LoadFactorySpecs(mesh_name, fact, file))
  	{
! 		app->PrintMessage("Loader: error loading mesh: no factory specs found.");
  		return false;
  	}
--- 98,102 ----
  	if (!LoadFactorySpecs(mesh_name, fact, file))
  	{
! 		app->PrintMessage("Loader: error loading mesh: no factory specs found for mesh '%s'\n", mesh_name);
  		return false;
  	}
***************
*** 104,108 ****
  	if (!pcmesh->SetMesh(fact, file))
  	{
! 		app->PrintMessage("Loader: error loading mesh: failed to set mesh.");
  		return false;
  	}
--- 104,108 ----
  	if (!pcmesh->SetMesh(fact, file))
  	{
! 		app->PrintMessage("Loader: error loading mesh: failed to set mesh '%s'.\n", mesh_name);
  		return false;
  	}

Index: ocnewavatarmsg.h
===================================================================
RCS file: /cvsroot/once/oncecode/src/common/ocnewavatarmsg.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ocnewavatarmsg.h	23 Dec 2004 10:38:50 -0000	1.1
--- ocnewavatarmsg.h	28 Dec 2004 00:41:47 -0000	1.2
***************
*** 47,50 ****
--- 47,54 ----
    /// avatarname -- should be obtained from the name generator
    csString avatarname;
+   /// race -- should be obtained from the name generator
+   csString race;
+   /// gender -- should be obtained from the name generator
+   csString gender;
  };
  

Index: ocnewavatarmsg.cpp
===================================================================
RCS file: /cvsroot/once/oncecode/src/common/ocnewavatarmsg.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ocnewavatarmsg.cpp	23 Dec 2004 10:38:50 -0000	1.1
--- ocnewavatarmsg.cpp	28 Dec 2004 00:41:47 -0000	1.2
***************
*** 47,51 ****
  {
  	SYSTRACE("ocNewAvatarMsg::GetMessageLength");
! 	return (uint32) (avatarname.Length() + 1);
  }
  
--- 47,52 ----
  {
  	SYSTRACE("ocNewAvatarMsg::GetMessageLength");
! 	return (uint32) (avatarname.Length() + 1 + race.Length()
! 			 + 1 + gender.Length() + 1);
  }
  
***************
*** 54,57 ****
--- 55,60 ----
  	SYSTRACE("ocNewAvatarMsg::Serialize");
  	buf.WriteString(avatarname);
+ 	buf.WriteString(race);
+ 	buf.WriteString(gender);
  }
  
***************
*** 60,63 ****
--- 63,68 ----
  	SYSTRACE("ocNewAvatarMsg::Deserialize");
  	if(!buf.ReadString(me->avatarname)) return false;
+ 	if(!buf.ReadString(me->race)) return false;
+ 	if(!buf.ReadString(me->gender)) return false;
  	return true;
  }

Index: ocsettings.cpp
===================================================================
RCS file: /cvsroot/once/oncecode/src/common/ocsettings.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ocsettings.cpp	5 Oct 2004 11:40:32 -0000	1.4
--- ocsettings.cpp	28 Dec 2004 00:41:47 -0000	1.5
***************
*** 259,263 ****
  	TryToGetElement(context, "id", numid, LoadInt, true);
  	TryToGetElement(context, "name", race.race, LoadString, true);
! 	TryToGetElement(context, "model", race.model, LoadString, true);
  	TryToGetElement(context, "x_size", race.x_size, LoadInt, true);
  	TryToGetElement(context, "y_size", race.y_size, LoadInt, true);
--- 259,264 ----
  	TryToGetElement(context, "id", numid, LoadInt, true);
  	TryToGetElement(context, "name", race.race, LoadString, true);
! 	TryToGetElement(context, "model_f", race.model_f, LoadString, true);
! 	TryToGetElement(context, "model_m", race.model_m, LoadString, true);
  	TryToGetElement(context, "x_size", race.x_size, LoadInt, true);
  	TryToGetElement(context, "y_size", race.y_size, LoadInt, true);

Index: ocsettings.h
===================================================================
RCS file: /cvsroot/once/oncecode/src/common/ocsettings.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ocsettings.h	18 Sep 2004 01:09:00 -0000	1.2
--- ocsettings.h	28 Dec 2004 00:41:47 -0000	1.3
***************
*** 39,43 ****
    ocRaceID id;
    csString race;
!   csString model;
    int x_size;
    int y_size;
--- 39,44 ----
    ocRaceID id;
    csString race;
!   csString model_f;
!   csString model_m;
    int x_size;
    int y_size;