CW Cyrix's Git Repository Mirror
Browse code

Updating in_2sf to use a newish version of DeSmuME, 0.9.9 from SVN. Somewhat cleaned up as well, but not everything because it's a pain in the ass.

Naram Qashat authored on 2013/04/18 17:22:55
Showing 1 changed files
src/in_2sf/desmume/common.cpp
History View file @ dfb7763
1 1 
deleted file mode 100644
... ... 
@@ -1,67 +0,0 @@
1 
-/*
2 
-	Copyright (C) 2008-2010 DeSmuME team
3 
-
4 
-	This file is free software: you can redistribute it and/or modify
5 
-	it under the terms of the GNU General Public License as published by
6 
-	the Free Software Foundation, either version 2 of the License, or
7 
-	(at your option) any later version.
8 
-
9 
-	This file is distributed in the hope that it will be useful,
10 
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
11 
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
12 
-	GNU General Public License for more details.
13 
-
14 
-	You should have received a copy of the GNU General Public License
15 
-	along with the this software.  If not, see <http://www.gnu.org/licenses/>.
16 
-*/
17 
-
18 
-//TODO - move this into ndssystem where it belongs probably
19 
-
20 
-#include <string>
21 
-#include <cstring>
22 
-
23 
-#include "common.h"
24 
-
25 
-const uint8_t logo_data[156] = {
26 
-	0x24,0xFF,0xAE,0x51,0x69,0x9A,0xA2,0x21,0x3D,0x84,0x82,0x0A,0x84,0xE4,0x09,0xAD,
27 
-	0x11,0x24,0x8B,0x98,0xC0,0x81,0x7F,0x21,0xA3,0x52,0xBE,0x19,0x93,0x09,0xCE,0x20,
28 
-	0x10,0x46,0x4A,0x4A,0xF8,0x27,0x31,0xEC,0x58,0xC7,0xE8,0x33,0x82,0xE3,0xCE,0xBF,
29 
-	0x85,0xF4,0xDF,0x94,0xCE,0x4B,0x09,0xC1,0x94,0x56,0x8A,0xC0,0x13,0x72,0xA7,0xFC,
30 
-	0x9F,0x84,0x4D,0x73,0xA3,0xCA,0x9A,0x61,0x58,0x97,0xA3,0x27,0xFC,0x03,0x98,0x76,
31 
-	0x23,0x1D,0xC7,0x61,0x03,0x04,0xAE,0x56,0xBF,0x38,0x84,0x00,0x40,0xA7,0x0E,0xFD,
32 
-	0xFF,0x52,0xFE,0x03,0x6F,0x95,0x30,0xF1,0x97,0xFB,0xC0,0x85,0x60,0xD6,0x80,0x25,
33 
-	0xA9,0x63,0xBE,0x03,0x01,0x4E,0x38,0xE2,0xF9,0xA2,0x34,0xFF,0xBB,0x3E,0x03,0x44,
34 
-	0x78,0x00,0x90,0xCB,0x88,0x11,0x3A,0x94,0x65,0xC0,0x7C,0x63,0x87,0xF0,0x3C,0xAF,
35 
-	0xD6,0x25,0xE4,0x8B,0x38,0x0A,0xAC,0x72,0x21,0xD4,0xF8,0x07};
36 
-
37 
-/*char *trim(char *s, int len)
38 
-{
39 
-	char *ptr = NULL;
40 
-	if (!s) return NULL;
41 
-	if (!*s) return s;
42 
-
43 
-	if(len==-1)
44 
-		ptr = s + strlen(s) - 1;
45 
-	else ptr = s+len - 1;
46 
-	for (; (ptr >= s) && (!*ptr || isspace((uint8_t)*ptr)) ; ptr--);
47 
-	ptr[1] = '\0';
48 
-	return s;
49 
-}*/
50 
-
51 
-/*char *removeSpecialChars(char *s)
52 
-{
53 
-	char	*buf = s;
54 
-	if (!s) return NULL;
55 
-	if (!*s) return s;
56 
-
57 
-	for (uint32_t i = 0; i < strlen(s); i++)
58 
-	{
59 
-		if (isspace((uint8_t)s[i]) && (s[i] != 0x20))
60 
-			*buf = 0x20;
61 
-		else
62 
-			*buf = s[i];
63 
-		buf++;
64 
-	}
65 
-	*buf = 0;
66 
-	return s;
67 
-}*/
Browse code

Import actual code.

Naram Qashat authored on 2013/03/26 02:41:19
Showing 1 changed files
src/in_2sf/desmume/common.cpp
History View file @ bc076aa
1 1 
new file mode 100644
... ... 
@@ -0,0 +1,67 @@
1 
+/*
2 
+	Copyright (C) 2008-2010 DeSmuME team
3 
+
4 
+	This file is free software: you can redistribute it and/or modify
5 
+	it under the terms of the GNU General Public License as published by
6 
+	the Free Software Foundation, either version 2 of the License, or
7 
+	(at your option) any later version.
8 
+
9 
+	This file is distributed in the hope that it will be useful,
10 
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
11 
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
12 
+	GNU General Public License for more details.
13 
+
14 
+	You should have received a copy of the GNU General Public License
15 
+	along with the this software.  If not, see <http://www.gnu.org/licenses/>.
16 
+*/
17 
+
18 
+//TODO - move this into ndssystem where it belongs probably
19 
+
20 
+#include <string>
21 
+#include <cstring>
22 
+
23 
+#include "common.h"
24 
+
25 
+const uint8_t logo_data[156] = {
26 
+	0x24,0xFF,0xAE,0x51,0x69,0x9A,0xA2,0x21,0x3D,0x84,0x82,0x0A,0x84,0xE4,0x09,0xAD,
27 
+	0x11,0x24,0x8B,0x98,0xC0,0x81,0x7F,0x21,0xA3,0x52,0xBE,0x19,0x93,0x09,0xCE,0x20,
28 
+	0x10,0x46,0x4A,0x4A,0xF8,0x27,0x31,0xEC,0x58,0xC7,0xE8,0x33,0x82,0xE3,0xCE,0xBF,
29 
+	0x85,0xF4,0xDF,0x94,0xCE,0x4B,0x09,0xC1,0x94,0x56,0x8A,0xC0,0x13,0x72,0xA7,0xFC,
30 
+	0x9F,0x84,0x4D,0x73,0xA3,0xCA,0x9A,0x61,0x58,0x97,0xA3,0x27,0xFC,0x03,0x98,0x76,
31 
+	0x23,0x1D,0xC7,0x61,0x03,0x04,0xAE,0x56,0xBF,0x38,0x84,0x00,0x40,0xA7,0x0E,0xFD,
32 
+	0xFF,0x52,0xFE,0x03,0x6F,0x95,0x30,0xF1,0x97,0xFB,0xC0,0x85,0x60,0xD6,0x80,0x25,
33 
+	0xA9,0x63,0xBE,0x03,0x01,0x4E,0x38,0xE2,0xF9,0xA2,0x34,0xFF,0xBB,0x3E,0x03,0x44,
34 
+	0x78,0x00,0x90,0xCB,0x88,0x11,0x3A,0x94,0x65,0xC0,0x7C,0x63,0x87,0xF0,0x3C,0xAF,
35 
+	0xD6,0x25,0xE4,0x8B,0x38,0x0A,0xAC,0x72,0x21,0xD4,0xF8,0x07};
36 
+
37 
+/*char *trim(char *s, int len)
38 
+{
39 
+	char *ptr = NULL;
40 
+	if (!s) return NULL;
41 
+	if (!*s) return s;
42 
+
43 
+	if(len==-1)
44 
+		ptr = s + strlen(s) - 1;
45 
+	else ptr = s+len - 1;
46 
+	for (; (ptr >= s) && (!*ptr || isspace((uint8_t)*ptr)) ; ptr--);
47 
+	ptr[1] = '\0';
48 
+	return s;
49 
+}*/
50 
+
51 
+/*char *removeSpecialChars(char *s)
52 
+{
53 
+	char	*buf = s;
54 
+	if (!s) return NULL;
55 
+	if (!*s) return s;
56 
+
57 
+	for (uint32_t i = 0; i < strlen(s); i++)
58 
+	{
59 
+		if (isspace((uint8_t)s[i]) && (s[i] != 0x20))
60 
+			*buf = 0x20;
61 
+		else
62 
+			*buf = s[i];
63 
+		buf++;
64 
+	}
65 
+	*buf = 0;
66 
+	return s;
67 
+}*/