Changeset 578 for Daodan

Timestamp:

Jan 12, 2011, 7:47:16 PM (14 years ago)

Author:

gumby

Message:

 

Location:

Daodan/MSVC

Files:

• Daodan_Utility.c (modified) (1 diff)
• Flatline.c (modified) ( previous)
• Flatline.h (modified) (2 diffs)
• Flatline_BSL.c (modified) (1 diff)
• Flatline_Server.c (modified) (6 diffs)
• Oni_GameState.h (modified) (1 diff)
• Oni_Symbols.c (modified) (1 diff)
• Oni_Symbols.h (modified) (4 diffs)
• startup.txt (modified) (1 diff)

Daodan/MSVC/Daodan_Utility.c

@@ -175 +175 @@
         }
 }
+
+void* ScoreboardInstance = 0;
+void FLrRun_Scores()
+{
+
+        if(!ScoreboardInstance){
+                void* TSFFTahoma;
+                TMrInstance_GetDataPtr( 'TSFF', "Tahoma", &TSFFTahoma);
+                TSrContext_New( TSFFTahoma, 7, 1, 1,  0, &ScoreboardInstance);
+        }
+        if(ScoreboardInstance){
+                int white = 0x00FFFFFF;
+                IMtPoint2D DrawLocation = {20, 20};
+                TSrContext_SetShade(ScoreboardInstance, white);
+                TSrContext_DrawText(ScoreboardInstance, "Scores and crap", 255, 0, &DrawLocation);      
+        }
+}
+
 void ONICALL DDrText_Hook()
 {

Daodan/MSVC/Flatline.h

@@ -82 +82 @@
 
 //um, status of the server? :/
+//probably obsolete. revive again once i do something crazy
+//like make a master server
 typedef struct {
         char name[256];
@@ -194 +196 @@
         EV_MAX,
 };
-
 
 

Daodan/MSVC/Flatline_BSL.c

@@ -98 +98 @@
                                         j,
                                         PlayerList[j]->name,
-                                        (inet_ntoa(*( (struct in_addr*)(int*)&(PlayerList[j]->ip )   ))));
+                                        inet_ntoa(*( (struct in_addr*)(int*)&(PlayerList[j]->ip )   )));
                         }
                 }

Daodan/MSVC/Flatline_Server.c

@@ -1 +1 @@
 #include "Flatline.h"
 #include "Flatline_Server.h"
+
+//I hereby apologize for the uglyness of the below code. 
+//It was never intended to be "final" code, much less shared with anyone
 
 int total_players = 0;
@@ -10 +13 @@
         uint32_t player_slot = 0;
         int playerlist_slot = 0;
-        if(is_server) goto server;
-        if(total_players < max_connections) {
-                char* zero = strchr(name, 0);
+        
+        if(is_server || total_players < max_connections) {
+                
                 int i = 0;
                 int k = 0;
-                playerlist_slot = FLr_FindEmptyListSlot();
-                
 
-                total_players++;
+                //Skip for the host
+                if(!is_server)
+                {
+                        char* zero = strchr(name, 0);
+                        playerlist_slot = FLr_FindEmptyListSlot();
 
-                //send new player packet to all players
-                //char tempname[32] = {0};
+                        total_players++;
 
-                //checks to see if a name exists or not
-                //then appends [#] on the end of it if it does
-                
-                if(zero - name > 28) zero = name + 28; 
-                for(i = 0; i < max_connections; i++) {
-                        if(PlayerList[i] != 0 && !strcmp(name, PlayerList[i]->name)) {
-                                k++;                            
-                                sprintf(zero, "[%i]", k);
-                                i = 0;
+                        //checks to see if a name exists or not
+                        //then appends [#] on the end of it if it does
+                        //May be buggy, come back to this.
+                        if(zero - name > 28) zero = name + 28; 
+                        for(i = 0; i < max_connections; i++) {
+                                if(PlayerList[i] != 0 && !strcmp(name, PlayerList[i]->name)) {
+                                        k++;                            
+                                        sprintf(zero, "[%i]", k);
+                                        i = 0;
+                                }
                         }
                 }
+                
+                new_char.new_player.Playernumber = playerlist_slot; 
 
-server:         ;
-                //memset( new_char, 0, sizeof(new_char);
-                //new_char = {0};
-                new_char.new_player.Playernumber = playerlist_slot; 
+                //Set up a new Character structure to be spawned as the new player.
+                //Can this code be surrounded with if(!is_server){}?
                 Char = &new_char.new_player.Character;
                 memset(Char, 0, sizeof(CharacterObject));
                 Char->Header.Type = 'CHAR';
-                //Char->OSD.Options = char_dontaim;
                 sprintf(Char->OSD.Name,"%s",name);
                 sprintf(Char->OSD.Class, "%s", "konoko_generic");
@@ -61 +65 @@
                 
                 //TMrInstance_GetDataPtr('ONCC', "striker_easy_1", PlayerList[playerlist_slot]->Chr->ONCC);
-                
 
                 new_char.id = NEW_PLAYER;
@@ -71 +74 @@
                         PlayerList[playerlist_slot] = Players+player_slot;
                         PlayerList[playerlist_slot]->spawnnumber = player_slot;
-                        PlayerList[playerlist_slot]->Chr = &((Character *)(((GameState * )(ONgGameState))->CharacterStorage))[player_slot];
-//                      PlayerList[playerlist_slot]->Chr->Flags = chr_dontaim | chr_unkillable; //&= 0xFFBFFFFF; //WTF
-                        if(!is_bot) PlayerList[playerlist_slot]->Chr->Flags &= 0xFFBFFFFF; //WTF
+                        PlayerList[playerlist_slot]->Chr = &(ONgGameState->CharacterStorage)[player_slot];
+                        //PlayerList[playerlist_slot]->Chr->Flags = chr_dontaim | chr_unkillable; //&= 0xFFBFFFFF; //WTF
+                        if(!is_bot) PlayerList[playerlist_slot]->Chr->Flags &= 0xFFBFFFFF; //WTF, magic number. 
                         sprintf(PlayerList[playerlist_slot]->Chr->Name, "%.31s", name);         
                         UDPServer_SendToAll( (char*)&new_char, sizeof(new_player) + FLATLINE_HEADER );
@@ -121 +124 @@
 }
 
+//Sends an event (door opening, player disconnecting, etc) to all players
 //Always make sure you send a pointer to this, even if it is just one arg. ;)
 void FLsPublic_Event( unsigned int eventIndex, int * args )
@@ -132 +136 @@
 }
 
+void PlayerDisconnect( int Player )
+{
+        FLsPublic_Event(EV_DISCONNECT, &Player );
+        memset(PlayerList[Player], 0, sizeof(player_info));
+        return;
+}

Daodan/MSVC/Oni_GameState.h

@@ -1183 +1183 @@
   __int16 AnimationType;
   __int16 NextAnimationType;
-  __int16 field_1B04;
+  __int16 PrevAnimationType;
   __int16 field_1B06;
   char Stitch;

Daodan/MSVC/Oni_Symbols.c

@@ -183 +183 @@
 //DefFunc( OBJrConsole_GetByID                                  , 0x004C0950 );
 DefFunc( OBJrConsole_OnActivate                                 , 0x004C0880 );
-
+DefFunc( ONrCharacter_SetAnimationExternal              , 0x004EB340 );
 #define DefVar(type, name, address) //type* _##name = (type*)address
 

Daodan/MSVC/Oni_Symbols.h

@@ -95 +95 @@
 typedef ActiveCharacter*        ( *_ONrGetActiveCharacter)(void* CharacterPtr);
 typedef void ( *_ONrCharacter_NewAnimationHook)(Character *ioCharacter, ActiveCharacter *ioActiveCharacter);
-//int16_t ONICALL ONrGameState_GetPlayerCharacter();
+typedef void ( *_ONrCharacter_SetAnimationExternal)(Character *ioCharacter, short state, void* animation, int interpolation);
 
 typedef void            ( *_COrTextArea_Print)(uint32_t area, uint32_t priority, 
@@ -117 +117 @@
 typedef char*   ( *_TMrInstance_GetInstanceName)(void* InstancePointer);
 
-typedef int16_t ( *_TSrContext_DrawText)(uint32_t TSrContext, char* Text, int alpha, uint32_t usuallyzero, void* pRect);
+typedef int16_t ( *_TSrContext_DrawText)(uint32_t TSrContext, char* Text, char alpha, uint32_t usuallyzero, void* pRect);
 //int16_t TSrContext_New        ( TSFF*, size 7, ??? 1, ??? 1, ??? 0, TSrContext*);
 typedef int16_t ( *_TSrContext_New)( void* FontInstance, int size, int hthsik1,int hthsik2,int hthsik3, void* TSrContext); 
@@ -125 +125 @@
         uint32_t        inShade);
 
-typedef uint16_t ( *_TRrAnimation_GetDuration)(int Animation);
-typedef uint16_t ( *_TRrAnimation_GetTo)(int Animation);
-typedef uint16_t ( *_TRrAnimation_GetFrom)(int Animation);
+typedef uint16_t ( *_TRrAnimation_GetDuration)(void* Animation);
+typedef uint16_t ( *_TRrAnimation_GetTo)(void* Animation);
+typedef uint16_t ( *_TRrAnimation_GetFrom)(void* Animation);
 
 typedef void
@@ -197 +197 @@
 ExtFunc(UUrStartupMessage);
 
+ExtFunc(ONrCharacter_SetAnimationExternal);
+
 ExtFunc(ONrCharacter_NewAnimationHook);
 ExtFunc(ONrCharacter_SetHitPoints);

Daodan/MSVC/startup.txt

@@ -1 +1 @@
 daodan attached!
+parsing daodan.ini...
 finished parsing
 parsing command line...