Skip to content

Commit

Permalink
Merge changes from branch beta6-ringzero and fixed up some issues
Browse files Browse the repository at this point in the history
from earlier merges. I can now successfully build this branch on
Windows using the existing VSC++ 2008 solution.
  • Loading branch information
danij-deng committed Sep 13, 2011
2 parents 7a7049c + eeea7cd commit ba553a1
Show file tree
Hide file tree
Showing 77 changed files with 3,455 additions and 2,241 deletions.
6 changes: 6 additions & 0 deletions doomsday/build/codeblocks/doomsday.cbp
Expand Up @@ -152,6 +152,7 @@
<Unit filename="..\..\engine\api\dd_ui.h" />
<Unit filename="..\..\engine\api\dd_vectorgraphic.h" />
<Unit filename="..\..\engine\api\dd_wad.h" />
<Unit filename="..\..\engine\api\dfile.h" />
<Unit filename="..\..\engine\api\doomsday.h" />
<Unit filename="..\..\engine\api\stringpool.h" />
<Unit filename="..\..\engine\api\sys_audiod.h" />
Expand Down Expand Up @@ -247,10 +248,12 @@
<Unit filename="..\..\engine\portable\include\edit_map.h" />
<Unit filename="..\..\engine\portable\include\fi_main.h" />
<Unit filename="..\..\engine\portable\include\filedirectory.h" />
<Unit filename="..\..\engine\portable\include\filelist.h" />
<Unit filename="..\..\engine\portable\include\finaleinterpreter.h" />
<Unit filename="..\..\engine\portable\include\font.h" />
<Unit filename="..\..\engine\portable\include\fonts.h" />
<Unit filename="..\..\engine\portable\include\fs_main.h" />
<Unit filename="..\..\engine\portable\include\fs_util.h" />
<Unit filename="..\..\engine\portable\include\gameinfo.h" />
<Unit filename="..\..\engine\portable\include\gl_defer.h" />
<Unit filename="..\..\engine\portable\include\gl_draw.h" />
Expand Down Expand Up @@ -513,6 +516,7 @@
<Unit filename="..\..\engine\portable\src\def_read.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="..\..\engine\portable\src\dfile.c" />
<Unit filename="..\..\engine\portable\src\dgl_common.c">
<Option compilerVar="CC" />
</Unit>
Expand All @@ -527,9 +531,11 @@
</Unit>
<Unit filename="..\..\engine\portable\src\fi_main.c" />
<Unit filename="..\..\engine\portable\src\filedirectory.c" />
<Unit filename="..\..\engine\portable\src\filelist.c" />
<Unit filename="..\..\engine\portable\src\finaleinterpreter.c" />
<Unit filename="..\..\engine\portable\src\fonts.c" />
<Unit filename="..\..\engine\portable\src\fs_main.c" />
<Unit filename="..\..\engine\portable\src\fs_util.c" />
<Unit filename="..\..\engine\portable\src\gameinfo.c" />
<Unit filename="..\..\engine\portable\src\gl_defer.c" />
<Unit filename="..\..\engine\portable\src\gl_draw.c" />
Expand Down
3 changes: 3 additions & 0 deletions doomsday/build/win32/doomsday_cl.rsp
Expand Up @@ -32,6 +32,8 @@
.\..\..\engine\portable\src\s_cache.c
.\..\..\engine\portable\src\fi_main.c
.\..\..\engine\portable\src\filedirectory.c
.\..\..\engine\portable\src\dfile.c
.\..\..\engine\portable\src\filelist.c
.\..\..\engine\portable\src\finaleinterpreter.c
.\..\..\engine\portable\src\fonts.c
.\..\..\engine\portable\src\gameinfo.c
Expand Down Expand Up @@ -169,6 +171,7 @@
.\..\..\engine\portable\src\wadfile.c
.\..\..\engine\portable\src\zipfile.c
.\..\..\engine\portable\src\fs_main.c
.\..\..\engine\portable\src\fs_util.c
.\..\..\engine\portable\src\dd_wad.c
.\..\..\engine\portable\src\dd_plugin.c
.\..\..\engine\portable\src\dd_pinit.c
Expand Down
56 changes: 48 additions & 8 deletions doomsday/build/win32/vs8/doomsday.vcproj
Expand Up @@ -1108,6 +1108,10 @@
RelativePath="..\..\..\engine\portable\include\filedirectory.h"
>
</File>
<File
RelativePath="..\..\..\engine\portable\include\filelist.h"
>
</File>
<File
RelativePath="..\..\..\engine\portable\include\finaleinterpreter.h"
>
Expand All @@ -1124,6 +1128,10 @@
RelativePath="..\..\..\engine\portable\include\fs_main.h"
>
</File>
<File
RelativePath="..\..\..\engine\portable\include\fs_util.h"
>
</File>
<File
RelativePath="..\..\..\engine\portable\include\gameinfo.h"
>
Expand Down Expand Up @@ -2221,10 +2229,22 @@
RelativePath="..\..\..\engine\api\dengproject.h"
>
</File>
<File
RelativePath="..\..\..\engine\api\dfile.h"
>
</File>
<File
RelativePath="..\..\..\engine\api\doomsday.h"
>
</File>
<File
RelativePath="..\..\..\engine\api\reader.h"
>
</File>
<File
RelativePath="..\..\..\engine\api\smoother.h"
>
</File>
<File
RelativePath="..\..\..\engine\api\stringpool.h"
>
Expand All @@ -2245,6 +2265,10 @@
RelativePath="..\..\..\engine\api\uri.h"
>
</File>
<File
RelativePath="..\..\..\engine\api\writer.h"
>
</File>
<Filter
Name="Win32"
>
Expand Down Expand Up @@ -2334,14 +2358,6 @@
RelativePath="..\..\..\engine\portable\src\cl_mobj.c"
>
</File>
<File
RelativePath="..\..\..\engine\portable\src\cl_oldframe.c"
>
</File>
<File
RelativePath="..\..\..\engine\portable\src\cl_oldworld.c"
>
</File>
<File
RelativePath="..\..\..\engine\portable\src\cl_player.c"
>
Expand Down Expand Up @@ -2438,6 +2454,10 @@
RelativePath="..\..\..\engine\portable\src\def_read.c"
>
</File>
<File
RelativePath="..\..\..\engine\portable\src\dfile.c"
>
</File>
<File
RelativePath="..\..\..\engine\portable\src\dgl_common.c"
>
Expand All @@ -2462,6 +2482,10 @@
RelativePath="..\..\..\engine\portable\src\filedirectory.c"
>
</File>
<File
RelativePath="..\..\..\engine\portable\src\filelist.c"
>
</File>
<File
RelativePath="..\..\..\engine\portable\src\finaleinterpreter.c"
>
Expand All @@ -2474,6 +2498,10 @@
RelativePath="..\..\..\engine\portable\src\fs_main.c"
>
</File>
<File
RelativePath="..\..\..\engine\portable\src\fs_util.c"
>
</File>
<File
RelativePath="..\..\..\engine\portable\src\gameinfo.c"
>
Expand Down Expand Up @@ -2766,6 +2794,10 @@
RelativePath="..\..\..\engine\portable\src\r_world.c"
>
</File>
<File
RelativePath="..\..\..\engine\portable\src\reader.c"
>
</File>
<File
RelativePath="..\..\..\engine\portable\src\rend_bias.c"
>
Expand Down Expand Up @@ -2862,6 +2894,10 @@
RelativePath="..\..\..\engine\portable\src\s_wav.c"
>
</File>
<File
RelativePath="..\..\..\engine\portable\src\smoother.c"
>
</File>
<File
RelativePath="..\..\..\engine\portable\src\stringpool.c"
>
Expand Down Expand Up @@ -3070,6 +3106,10 @@
RelativePath="..\..\..\engine\portable\src\wadfile.c"
>
</File>
<File
RelativePath="..\..\..\engine\portable\src\writer.c"
>
</File>
<File
RelativePath="..\..\..\engine\portable\src\zipfile.c"
>
Expand Down
53 changes: 53 additions & 0 deletions doomsday/engine/api/dfile.h
@@ -0,0 +1,53 @@
/**\file dfile.h
*\section License
* License: GPL
* Online License Link: http://www.gnu.org/licenses/gpl.html
*
*\author Copyright © 2011 Daniel Swanson <danij@dengine.net>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor,
* Boston, MA 02110-1301 USA
*/

#ifndef LIBDENG_FILESYS_FILEHANDLE_H
#define LIBDENG_FILESYS_FILEHANDLE_H

#ifdef __cplusplus
extern "C" {
#endif

#include "dd_types.h"

/**
* DFile. DFile Represents a unique (public) file reference in the
* engine's Virtual File System (vfs).
*
* @ingroup fs
*/
struct dfile_s; // The file handle instance (opaque).
typedef struct dfile_s DFile;

/// @return @c true iff this handle's internal state is valid.
boolean DFile_IsValid(const DFile* hndl);

#if _DEBUG
void DFile_Print(const DFile* hndl);
#endif

#ifdef __cplusplus
} // extern "C"
#endif

#endif /* LIBDENG_FILESYS_FILEHANDLE_H */
10 changes: 5 additions & 5 deletions doomsday/engine/api/doomsday.def
@@ -1,6 +1,6 @@
; Doomsday Engine API (Routines exported from Doomsday.exe).
;
; Highest ordinal is currently: --> 585 <--
; Highest ordinal is currently: --> 589 <--
; Other free ordinals: none

NAME "DOOMSDAY"
Expand Down Expand Up @@ -219,8 +219,8 @@ EXPORTS
Net_GetTicCmd @54 NONAME
Net_GetPlayerName @55 NONAME
Net_GetPlayerID @56 NONAME
Net_PlayerSmoother @541 NONAME
Sv_CanTrustClientPos @542 NONAME
Net_PlayerSmoother @586 NONAME
Sv_CanTrustClientPos @587 NONAME

; Play.
P_AccurateDistance @57 NONAME
Expand Down Expand Up @@ -355,7 +355,7 @@ EXPORTS
P_MobjSectorsIterator @72 NONAME
P_MobjForID @333 NONAME
ClMobj_IsValid @103 NONAME
ClPlayer_ClMobj @537 NONAME
ClPlayer_ClMobj @588 NONAME

; Play: Polyobjs.
P_PolyobjMove @79 NONAME
Expand Down Expand Up @@ -384,7 +384,7 @@ EXPORTS
DD_IterateThinkers @425 NONAME

; Refresh.
DD_IsSharpTick @538 NONAME
DD_IsSharpTick @589 NONAME
DD_GetFrameRate @88 NONAME
R_SetupMap @89 NONAME
R_PrecacheMobjNum @427 NONAME
Expand Down
4 changes: 2 additions & 2 deletions doomsday/engine/api/doomsday.h
Expand Up @@ -69,10 +69,10 @@ struct font_s;

#include "dd_share.h"
#include "dd_plugin.h"

#include "dfile.h"
#include "reader.h"
#include "smoother.h"
#include "stringpool.h"
#include "reader.h"
#include "writer.h"
#include "uri.h"

Expand Down

0 comments on commit ba553a1

Please sign in to comment.