Skip to content

Commit

Permalink
Added COBJ header.
Browse files Browse the repository at this point in the history 
Disabled NPCs, don't need them by now.
  • Loading branch information
@greenboxal
greenboxal committed Apr 8, 2013
1 parent d5b354f commit 5e018af
Show file tree
Hide file tree
Showing 4 changed files with 117 additions and 98 deletions.
24 changes: 13 additions & 11 deletions npc/re/scripts_main.conf
View file
Expand Up @@ -26,19 +26,21 @@ npc: npc/other/Global_Functions.txt
npc: npc/other/CashShop_Functions.txt

// ------------------- Common Script Files ----------------------
import: npc/scripts_athena.conf
import: npc/scripts_guild.conf
import: npc/scripts_jobs.conf
import: npc/scripts_mapflags.conf
import: npc/scripts_monsters.conf
import: npc/scripts_warps.conf
//import: npc/scripts_athena.conf
//import: npc/scripts_guild.conf
//import: npc/scripts_jobs.conf
//import: npc/scripts_mapflags.conf
//import: npc/scripts_monsters.conf
//import: npc/scripts_warps.conf

// ------------------- Renewal Script Files ---------------------
import: npc/re/scripts_athena.conf
import: npc/re/scripts_jobs.conf
import: npc/re/scripts_monsters.conf
import: npc/re/scripts_warps.conf
//import: npc/re/scripts_athena.conf
//import: npc/re/scripts_jobs.conf
//import: npc/re/scripts_monsters.conf
//import: npc/re/scripts_warps.conf

// ------------------- Custom Script Files ----------------------
// - Your NPCs go in this file!
import: npc/scripts_custom.conf
//import: npc/scripts_custom.conf


21 changes: 21 additions & 0 deletions src/common/cobj.h
View file
@@ -0,0 +1,21 @@
// Copyright (c) Hercules Dev Team, licensed under GNU GPL.
// See the LICENSE file

#ifndef _COBJ_H_
#define _COBJ_H_

// Defines a pattern for creating "classes"

#define COBJ(name) \
struct name

#define COBJ_DEF_DETAIL \
void *__detail;

#define COBJ_GET_DETAIL(obj, type) ((type)((obj)->__detail))
#define COBJ_SET_DETAIL(obj, value) (obj)->__detail = (void*)(value)

#define VTABLE_ENTRY(ret, name, args) \
ret (*name) args;

#endif
9 changes: 5 additions & 4 deletions vcproj-12/char-server.vcxproj
View file
Expand Up @@ -140,9 +140,10 @@
<ClInclude Include="..\3rdparty\libconfig\strbuf.h" />
<ClInclude Include="..\3rdparty\libconfig\wincompat.h" />
<ClInclude Include="..\3rdparty\mt19937ar\mt19937ar.h" />
<ClInclude Include="..\src\char\inter_packets.h" />
<ClInclude Include="..\src\common\cbasetypes.h" />
<ClInclude Include="..\src\common\core.h" />
<ClInclude Include="..\src\common\console.h" />
<ClInclude Include="..\src\common\console.h" />
<ClInclude Include="..\src\common\db.h" />
<ClInclude Include="..\src\common\ers.h" />
<ClInclude Include="..\src\common\malloc.h" />
Expand Down Expand Up @@ -172,7 +173,7 @@
<ClInclude Include="..\src\char\int_quest.h" />
<ClInclude Include="..\src\char\int_storage.h" />
<ClInclude Include="..\src\char\inter.h" />
<ClInclude Include="..\src\char\pincode.h" />
<ClInclude Include="..\src\char\pincode.h" />
<ClInclude Include="..\src\common\winapi.h" />
</ItemGroup>
<ItemGroup>
Expand All @@ -183,7 +184,7 @@
<ClCompile Include="..\3rdparty\libconfig\strbuf.c" />
<ClCompile Include="..\3rdparty\mt19937ar\mt19937ar.c" />
<ClCompile Include="..\src\common\core.c" />
<ClCompile Include="..\src\common\console.c" />
<ClCompile Include="..\src\common\console.c" />
<ClCompile Include="..\src\common\db.c" />
<ClCompile Include="..\src\common\ers.c" />
<ClCompile Include="..\src\common\malloc.c" />
Expand Down Expand Up @@ -212,7 +213,7 @@
<ClCompile Include="..\src\char\int_quest.c" />
<ClCompile Include="..\src\char\int_storage.c" />
<ClCompile Include="..\src\char\inter.c" />
<ClCompile Include="..\src\char\pincode.c" />
<ClCompile Include="..\src\char\pincode.c" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
Expand Down
161 changes: 78 additions & 83 deletions vcproj-12/char-server.vcxproj.filters
View file
Expand Up @@ -4,7 +4,7 @@
<ClCompile Include="..\src\common\core.c">
<Filter>common</Filter>
</ClCompile>
<ClCompile Include="..\src\common\console.c">
<ClCompile Include="..\src\common\console.c">
<Filter>common</Filter>
</ClCompile>
<ClCompile Include="..\src\common\db.c">
Expand Down Expand Up @@ -43,45 +43,6 @@
<ClCompile Include="..\src\common\utils.c">
<Filter>common</Filter>
</ClCompile>
<ClCompile Include="..\src\char\char.c">
<Filter>char_sql</Filter>
</ClCompile>
<ClCompile Include="..\src\char\int_auction.c">
<Filter>char_sql</Filter>
</ClCompile>
<ClCompile Include="..\src\char\int_elemental.c">
<Filter>char_sql</Filter>
</ClCompile>
<ClCompile Include="..\src\char\int_guild.c">
<Filter>char_sql</Filter>
</ClCompile>
<ClCompile Include="..\src\char\int_homun.c">
<Filter>char_sql</Filter>
</ClCompile>
<ClCompile Include="..\src\char\int_mail.c">
<Filter>char_sql</Filter>
</ClCompile>
<ClCompile Include="..\src\char\int_mercenary.c">
<Filter>char_sql</Filter>
</ClCompile>
<ClCompile Include="..\src\char\int_party.c">
<Filter>char_sql</Filter>
</ClCompile>
<ClCompile Include="..\src\char\int_pet.c">
<Filter>char_sql</Filter>
</ClCompile>
<ClCompile Include="..\src\char\int_quest.c">
<Filter>char_sql</Filter>
</ClCompile>
<ClCompile Include="..\src\char\int_storage.c">
<Filter>char_sql</Filter>
</ClCompile>
<ClCompile Include="..\src\char\inter.c">
<Filter>char_sql</Filter>
</ClCompile>
<ClCompile Include="..\src\char\pincode.c">
<Filter>char_sql</Filter>
</ClCompile>
<ClCompile Include="..\3rdparty\mt19937ar\mt19937ar.c">
<Filter>3rdparty\mt19937ar</Filter>
</ClCompile>
Expand Down Expand Up @@ -112,6 +73,41 @@
<ClCompile Include="..\src\common\raconf.c">
<Filter>common</Filter>
</ClCompile>
<ClCompile Include="..\src\char\int_auction.c">
<Filter>inter</Filter>
</ClCompile>
<ClCompile Include="..\src\char\int_elemental.c">
<Filter>inter</Filter>
</ClCompile>
<ClCompile Include="..\src\char\int_guild.c">
<Filter>inter</Filter>
</ClCompile>
<ClCompile Include="..\src\char\int_homun.c">
<Filter>inter</Filter>
</ClCompile>
<ClCompile Include="..\src\char\int_mail.c">
<Filter>inter</Filter>
</ClCompile>
<ClCompile Include="..\src\char\int_mercenary.c">
<Filter>inter</Filter>
</ClCompile>
<ClCompile Include="..\src\char\int_party.c">
<Filter>inter</Filter>
</ClCompile>
<ClCompile Include="..\src\char\int_pet.c">
<Filter>inter</Filter>
</ClCompile>
<ClCompile Include="..\src\char\int_quest.c">
<Filter>inter</Filter>
</ClCompile>
<ClCompile Include="..\src\char\int_storage.c">
<Filter>inter</Filter>
</ClCompile>
<ClCompile Include="..\src\char\inter.c">
<Filter>inter</Filter>
</ClCompile>
<ClCompile Include="..\src\char\char.c" />
<ClCompile Include="..\src\char\pincode.c" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\src\common\cbasetypes.h">
Expand All @@ -120,7 +116,7 @@
<ClInclude Include="..\src\common\core.h">
<Filter>common</Filter>
</ClInclude>
<ClInclude Include="..\src\common\console.h">
<ClInclude Include="..\src\common\console.h">
<Filter>common</Filter>
</ClInclude>
<ClInclude Include="..\src\common\db.h">
Expand Down Expand Up @@ -162,45 +158,6 @@
<ClInclude Include="..\src\common\utils.h">
<Filter>common</Filter>
</ClInclude>
<ClInclude Include="..\src\char\inter.h">
<Filter>char_sql</Filter>
</ClInclude>
<ClInclude Include="..\src\char\pincode.h">
<Filter>char_sql</Filter>
</ClInclude>
<ClInclude Include="..\src\char\char.h">
<Filter>char_sql</Filter>
</ClInclude>
<ClInclude Include="..\src\char\int_auction.h">
<Filter>char_sql</Filter>
</ClInclude>
<ClInclude Include="..\src\char\int_elemental.h">
<Filter>char_sql</Filter>
</ClInclude>
<ClInclude Include="..\src\char\int_guild.h">
<Filter>char_sql</Filter>
</ClInclude>
<ClInclude Include="..\src\char\int_homun.h">
<Filter>char_sql</Filter>
</ClInclude>
<ClInclude Include="..\src\char\int_mail.h">
<Filter>char_sql</Filter>
</ClInclude>
<ClInclude Include="..\src\char\int_mercenary.h">
<Filter>char_sql</Filter>
</ClInclude>
<ClInclude Include="..\src\char\int_party.h">
<Filter>char_sql</Filter>
</ClInclude>
<ClInclude Include="..\src\char\int_pet.h">
<Filter>char_sql</Filter>
</ClInclude>
<ClInclude Include="..\src\char\int_quest.h">
<Filter>char_sql</Filter>
</ClInclude>
<ClInclude Include="..\src\char\int_storage.h">
<Filter>char_sql</Filter>
</ClInclude>
<ClInclude Include="..\3rdparty\mt19937ar\mt19937ar.h">
<Filter>3rdparty\mt19937ar</Filter>
</ClInclude>
Expand Down Expand Up @@ -240,14 +197,49 @@
<ClInclude Include="..\src\common\raconf.h">
<Filter>common</Filter>
</ClInclude>
<ClInclude Include="..\src\char\int_auction.h">
<Filter>inter</Filter>
</ClInclude>
<ClInclude Include="..\src\char\int_elemental.h">
<Filter>inter</Filter>
</ClInclude>
<ClInclude Include="..\src\char\int_guild.h">
<Filter>inter</Filter>
</ClInclude>
<ClInclude Include="..\src\char\int_homun.h">
<Filter>inter</Filter>
</ClInclude>
<ClInclude Include="..\src\char\int_mail.h">
<Filter>inter</Filter>
</ClInclude>
<ClInclude Include="..\src\char\int_mercenary.h">
<Filter>inter</Filter>
</ClInclude>
<ClInclude Include="..\src\char\int_party.h">
<Filter>inter</Filter>
</ClInclude>
<ClInclude Include="..\src\char\int_pet.h">
<Filter>inter</Filter>
</ClInclude>
<ClInclude Include="..\src\char\int_quest.h">
<Filter>inter</Filter>
</ClInclude>
<ClInclude Include="..\src\char\int_storage.h">
<Filter>inter</Filter>
</ClInclude>
<ClInclude Include="..\src\char\inter.h">
<Filter>inter</Filter>
</ClInclude>
<ClInclude Include="..\src\char\char.h" />
<ClInclude Include="..\src\char\pincode.h" />
<ClInclude Include="..\src\char\inter_packets.h">
<Filter>inter</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<Filter Include="common">
<UniqueIdentifier>{623f21b1-c166-4848-83d8-8b4fe0e2e2df}</UniqueIdentifier>
</Filter>
<Filter Include="char_sql">
<UniqueIdentifier>{83b1ecf5-21d1-4dac-915f-95ff77a90899}</UniqueIdentifier>
</Filter>
<Filter Include="3rdparty">
<UniqueIdentifier>{b3f5c857-79c0-4a55-b8c5-7e7f56a8f948}</UniqueIdentifier>
</Filter>
Expand All @@ -257,5 +249,8 @@
<Filter Include="3rdparty\libconfig">
<UniqueIdentifier>{9e8badd7-548f-4eb4-9e87-613e87e772ff}</UniqueIdentifier>
</Filter>
<Filter Include="inter">
<UniqueIdentifier>{1d96fee0-bb59-4bc5-832d-f3c66679c701}</UniqueIdentifier>
</Filter>
</ItemGroup>
</Project>

0 comments on commit 5e018af

Please sign in to comment.