Changeset 432 for Daodan

Timestamp:

Jul 16, 2009, 10:49:08 AM (15 years ago)

Author:

gumby

Message:

 

Location:

Daodan/src

Files:

• Daodan_Character.c (modified) (1 diff)
• Oni_Character.h (modified) (3 diffs)

Daodan/src/Daodan_Character.c

@@ -18 +18 @@
 void CHARTest()
 {
-        CharacterObject* TestCHAR = malloc(sizeof(CharacterObject));
-        memset(TestCHAR, 0, sizeof(CharacterObject));
+        CharacterObject TestCHAR;
+        memset(&TestCHAR, 0, sizeof(CharacterObject));
         
-        memcpy(TestCHAR->Header.Type, "CHAR", 4);
-        memcpy(TestCHAR->OSD.Name, "Gumby", 6);
-        memcpy(TestCHAR->OSD.Class, "muro_generic", 13);
-        TestCHAR->OSD.TeamID = team_syndicate;
+        memcpy(TestCHAR.Header.Type, "CHAR", 4);
+        memcpy(TestCHAR.OSD.Name, "Gumby", 6);
+        memcpy(TestCHAR.OSD.Class, "muro_generic", 13);
+        TestCHAR.OSD.TeamID = team_syndicate;
         
-        ONrGameState_NewCharacter(TestCHAR, NULL, NULL, NULL);
+        //ONrGameState_NewCharacter(&TestCHAR, NULL);
 }

Daodan/src/Oni_Character.h

@@ -13 +13 @@
 
 typedef struct {
-        char Type[4];                   //"CHAR" etc.
+        int Type;                               //'CHAR' etc.
         int ObjectId;                   //not needed
         int Flags;                              //The flags of the object...not used for CHAR
@@ -48 +48 @@
         int16_t NCIUsed;                                //Don't use this...
         int16_t NCIDropped;                             //Don't use this...
-        
         int32_t TeamID;                                 //Team ID
         int32_t AmmoPercent;                    //Percent of weapon ammo full
@@ -90 +89 @@
 };
 
-int16_t ONICALL ONrGameState_NewCharacter(CharacterObject* character, void* something, void* somethingelse, void* anotherthing);
+int16_t ONICALL ONrGameState_NewCharacter(CharacterObject* CHAR, void* AISA, void* flag, int* list_location);
 
 #endif