summaryrefslogtreecommitdiff
path: root/src/char
diff options
context:
space:
mode:
authorBen Longbons <b.r.longbons@gmail.com>2012-08-30 16:16:25 -0700
committerBen Longbons <b.r.longbons@gmail.com>2012-08-30 17:03:31 -0700
commit41974ae5265fbc23a06f276f9e008d5dad020e0b (patch)
tree9d595215172e87e2d83b74f7bf3430b3040e780e /src/char
parent21742909143df9159b2401c3e2a39cc0b2bad620 (diff)
downloadtmwa-41974ae5265fbc23a06f276f9e008d5dad020e0b.tar.gz
tmwa-41974ae5265fbc23a06f276f9e008d5dad020e0b.tar.bz2
tmwa-41974ae5265fbc23a06f276f9e008d5dad020e0b.tar.xz
tmwa-41974ae5265fbc23a06f276f9e008d5dad020e0b.zip
Rename files for C++ conversion. Does not compile.
After updating, you can remove these files, as shown in 'git status': Untracked files: (use "git add <file>..." to include in what will be committed) src/map/magic-interpreter-lexer.c src/map/magic-interpreter-parser.c src/map/magic-interpreter-parser.h
Diffstat (limited to 'src/char')
-rw-r--r--src/char/char.cpp (renamed from src/char/char.c)26
-rw-r--r--src/char/char.hpp (renamed from src/char/char.h)4
-rw-r--r--src/char/int_guild.cpp (renamed from src/char/int_guild.c)16
-rw-r--r--src/char/int_guild.hpp (renamed from src/char/int_guild.h)4
-rw-r--r--src/char/int_party.cpp (renamed from src/char/int_party.c)14
-rw-r--r--src/char/int_party.hpp (renamed from src/char/int_party.h)4
-rw-r--r--src/char/int_storage.cpp (renamed from src/char/int_storage.c)16
-rw-r--r--src/char/int_storage.hpp (renamed from src/char/int_storage.h)4
-rw-r--r--src/char/inter.cpp (renamed from src/char/inter.c)20
-rw-r--r--src/char/inter.hpp (renamed from src/char/inter.h)4
10 files changed, 56 insertions, 56 deletions
diff --git a/src/char/char.c b/src/char/char.cpp
index 2a46283..a57520b 100644
--- a/src/char/char.c
+++ b/src/char/char.cpp
@@ -18,21 +18,21 @@
#include <stdarg.h>
#include <sys/wait.h>
-#include "../common/core.h"
-#include "../common/socket.h"
-#include "../common/timer.h"
-#include "../common/mmo.h"
-#include "../common/version.h"
-#include "../common/lock.h"
-#include "char.h"
-
-#include "inter.h"
-#include "int_guild.h"
-#include "int_party.h"
-#include "int_storage.h"
+#include "../common/core.hpp"
+#include "../common/socket.hpp"
+#include "../common/timer.hpp"
+#include "../common/mmo.hpp"
+#include "../common/version.hpp"
+#include "../common/lock.hpp"
+#include "char.hpp"
+
+#include "inter.hpp"
+#include "int_guild.hpp"
+#include "int_party.hpp"
+#include "int_storage.hpp"
#ifdef MEMWATCH
-#include "memwatch.h"
+#include "memwatch.hpp"
#endif
struct mmo_map_server server[MAX_MAP_SERVERS];
diff --git a/src/char/char.h b/src/char/char.hpp
index cc64024..22b7678 100644
--- a/src/char/char.h
+++ b/src/char/char.hpp
@@ -1,6 +1,6 @@
// $Id: char.h,v 1.1.1.1 2004/09/10 17:26:50 MagicalTux Exp $
-#ifndef _CHAR_H_
-#define _CHAR_H_
+#ifndef CHAR_HPP
+#define CHAR_HPP
#define MAX_MAP_SERVERS 30
diff --git a/src/char/int_guild.c b/src/char/int_guild.cpp
index 05aae6b..fe9a95b 100644
--- a/src/char/int_guild.c
+++ b/src/char/int_guild.cpp
@@ -1,12 +1,12 @@
// $Id: int_guild.c,v 1.2 2004/09/25 19:36:53 Akitasha Exp $
-#include "inter.h"
-#include "int_guild.h"
-#include "int_storage.h"
-#include "../common/mmo.h"
-#include "char.h"
-#include "../common/socket.h"
-#include "../common/db.h"
-#include "../common/lock.h"
+#include "inter.hpp"
+#include "int_guild.hpp"
+#include "int_storage.hpp"
+#include "../common/mmo.hpp"
+#include "char.hpp"
+#include "../common/socket.hpp"
+#include "../common/db.hpp"
+#include "../common/lock.hpp"
#include <string.h>
#include <stdio.h>
diff --git a/src/char/int_guild.h b/src/char/int_guild.hpp
index 5ac9a51..2833e2d 100644
--- a/src/char/int_guild.h
+++ b/src/char/int_guild.hpp
@@ -1,6 +1,6 @@
// $Id: int_guild.h,v 1.1.1.1 2004/09/10 17:26:51 MagicalTux Exp $
-#ifndef _INT_GUILD_H_
-#define _INT_GUILD_H_
+#ifndef INT_GUILD_HPP
+#define INT_GUILD_HPP
int inter_guild_init (void);
int inter_guild_save (void);
diff --git a/src/char/int_party.c b/src/char/int_party.cpp
index 6f8d023..7d0e0ce 100644
--- a/src/char/int_party.c
+++ b/src/char/int_party.cpp
@@ -1,11 +1,11 @@
// $Id: int_party.c,v 1.1.1.1 2004/09/10 17:26:51 MagicalTux Exp $
-#include "inter.h"
-#include "int_party.h"
-#include "../common/mmo.h"
-#include "char.h"
-#include "../common/socket.h"
-#include "../common/db.h"
-#include "../common/lock.h"
+#include "inter.hpp"
+#include "int_party.hpp"
+#include "../common/mmo.hpp"
+#include "char.hpp"
+#include "../common/socket.hpp"
+#include "../common/db.hpp"
+#include "../common/lock.hpp"
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
diff --git a/src/char/int_party.h b/src/char/int_party.hpp
index 2007ed5..93e8887 100644
--- a/src/char/int_party.h
+++ b/src/char/int_party.hpp
@@ -1,6 +1,6 @@
// $Id: int_party.h,v 1.1.1.1 2004/09/10 17:26:51 MagicalTux Exp $
-#ifndef _INT_PARTY_H_
-#define _INT_PARTY_H_
+#ifndef INT_PARTY_HPP
+#define INT_PARTY_HPP
int inter_party_init (void);
int inter_party_save (void);
diff --git a/src/char/int_storage.c b/src/char/int_storage.cpp
index e565572..b197213 100644
--- a/src/char/int_storage.c
+++ b/src/char/int_storage.cpp
@@ -3,14 +3,14 @@
#include <string.h>
#include <stdlib.h>
-#include "../common/mmo.h"
-#include "../common/socket.h"
-#include "../common/db.h"
-#include "../common/lock.h"
-#include "char.h"
-#include "inter.h"
-#include "int_storage.h"
-#include "int_guild.h"
+#include "../common/mmo.hpp"
+#include "../common/socket.hpp"
+#include "../common/db.hpp"
+#include "../common/lock.hpp"
+#include "char.hpp"
+#include "inter.hpp"
+#include "int_storage.hpp"
+#include "int_guild.hpp"
// ファイル名のデフォルト
// inter_config_read()で再設定される
diff --git a/src/char/int_storage.h b/src/char/int_storage.hpp
index f1859c6..9986f2d 100644
--- a/src/char/int_storage.h
+++ b/src/char/int_storage.hpp
@@ -1,6 +1,6 @@
// $Id: int_storage.h,v 1.1.1.1 2004/09/10 17:26:51 MagicalTux Exp $
-#ifndef _INT_STORAGE_H_
-#define _INT_STORAGE_H_
+#ifndef INT_STORAGE_HPP
+#define INT_STORAGE_HPP
int inter_storage_init (void);
void inter_storage_final (void);
diff --git a/src/char/inter.c b/src/char/inter.cpp
index e886bf6..af95a2d 100644
--- a/src/char/inter.c
+++ b/src/char/inter.cpp
@@ -1,17 +1,17 @@
// $Id: inter.c,v 1.1.1.1 2004/09/10 17:26:51 MagicalTux Exp $
-#include "../common/mmo.h"
-#include "char.h"
-#include "../common/socket.h"
-#include "../common/timer.h"
-#include "../common/db.h"
+#include "../common/mmo.hpp"
+#include "char.hpp"
+#include "../common/socket.hpp"
+#include "../common/timer.hpp"
+#include "../common/db.hpp"
#include <string.h>
#include <stdlib.h>
-#include "inter.h"
-#include "int_party.h"
-#include "int_guild.h"
-#include "int_storage.h"
-#include "../common/lock.h"
+#include "inter.hpp"
+#include "int_party.hpp"
+#include "int_guild.hpp"
+#include "int_storage.hpp"
+#include "../common/lock.hpp"
#define WISDATA_TTL (60*1000) // Existence time of Wisp/page data (60 seconds)
// that is the waiting time of answers of all map-servers
diff --git a/src/char/inter.h b/src/char/inter.hpp
index 219f195..769324c 100644
--- a/src/char/inter.h
+++ b/src/char/inter.hpp
@@ -1,6 +1,6 @@
// $Id: inter.h,v 1.1.1.1 2004/09/10 17:26:51 MagicalTux Exp $
-#ifndef _INTER_H_
-#define _INTER_H_
+#ifndef INTER_HPP
+#define INTER_HPP
int inter_init (const char *file);
int inter_save (void);