ViewVC Help

View File | Revision Log | View Changeset | Root Listing

root/Oni2/Daodan/src/Daodan_Character.c

Comparing Daodan/src/Daodan_Character.c (file contents):
Revision 677 by alloc, Sat Mar 2 23:46:33 2013 UTC vs.
Revision 692 by alloc, Thu Mar 7 17:26:13 2013 UTC

#	Line 1 | Line 1
1		#include <stdlib.h>
2		#include "Daodan_Character.h"
3		#include "Oni_Character.h"
4	–	#include "BFW_Utility.h"
4		#include "Oni.h"
5
6		int DDr_TeamToTeamID(const char* team_string) //Already something like this in the engine, but I'm reimplementing it...
#	Line 27 | Line 26 | uint32_t DDrGetCharacterIndexFromName(ch
26		return characterlist[i]->Number;
27		}
28		}
29	<	return -1;                                                                                                      //not found :(
29	>	return -1;                                                                                                      //not found :(
30		}
31	<	/*
33	<	OniRectangle TestRect;
34	<	void CHARTest()
35	<	{
36	<
37	<	CharacterObject* TestCHAR = malloc(sizeof(CharacterObject));
38	<	memset(TestCHAR, 0, sizeof(CharacterObject));
39	<
40	<	int type = 0x43484152;
41	<	TestCHAR->Header.Type = type;
42	<	memcpy(TestCHAR->OSD.Name, "Gumby", 6);
43	<	memcpy(TestCHAR->OSD.Class, "striker_easy_1", 15);
44	<	memcpy(TestCHAR->OSD.ScriptSpawn, "dmsg", 20);
45	<	//TestCHAR->OSD.Options = chr_unkillable;
46	<	TestCHAR->OSD.TeamID = team_syndicate;
47	<	//int* ptr = 0x005ECE70;
48	<	TestRect.Top = 10;
49	<	TestRect.Left = 10;
50	<	TestRect.Right = 100;
51	<	TestRect.Bottom = 100;
52	<
53	<	char str[5] = "hi";
54	<	str[2] = '\0';
55	<	AUrMessageBox(0, "%8x", &TestRect);
56	<	int16_t a = TSrContext_DrawText(TestContext, str, 0xFF, &TestRect, &TestRect);
57	<	//ONrGameState_NewCharacter(TestCHAR, NULL, NULL, NULL);
58	<	return;
59	<	}
60	<	*/
31	>

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines (old)
>	Changed lines (new)