Back to the Korax Forum Archives
Firebrand
dj_jl
Firebrand
Firebrand
dj_jl
Firebrand
RambOrc
dj_jl
Firebrand
dj_jl
RambOrc
Firebrand
Firebrand
constexp.obj : error LNK2001: unresolved external symbol "int __cdecl Pass1::CheckForConstant(class FName)" (?CheckForConstant@Pass1@@YAHVFName@@@Z) info.obj : error LNK2001: unresolved external symbol "int __cdecl Pass1::ParseStateCode(class TType *)" (?ParseStateCode@Pass1@@YAHPAVTType@@@Z) info.obj : error LNK2001: unresolved external symbol "void __cdecl Pass1::AddConstant(class FName,int)" (?AddConstant@Pass1@@YAXVFName@@H@Z) types.obj : error LNK2001: unresolved external symbol "void __cdecl Pass1::ParseMethodDef(class TType *,struct field_t *,struct field_t *,class TType *,int)" (?ParseMethodDef@Pass1@@YAXPAVTType@@PAUfield_t@@10H@Z) types.obj : error LNK2001: unresolved external symbol "void __cdecl Pass1::ParseDefaultProperties(struct field_t *,class TType *)" (?ParseDefaultProperties@Pass1@@YAXPAUfield_t@@PAVTType@@@Z) vcc.obj : error LNK2001: unresolved external symbol "void __cdecl Pass1::PA_Parse(void)" (?PA_Parse@Pass1@@YAXXZ) ../../utils/bin/vcc.exe : fatal error LNK1120: 6 unresolved externals Error executing link.exe. vcc.exe - 7 error(s), 0 warning(s)Any help on this will be really appreciated!
dj_jl
Firebrand
Linking... r_model.obj : error LNK2001: unresolved external symbol _png_destroy_read_struct r_model.obj : error LNK2001: unresolved external symbol _png_read_end r_model.obj : error LNK2001: unresolved external symbol _png_read_image r_model.obj : error LNK2001: unresolved external symbol _png_set_gray_to_rgb r_model.obj : error LNK2001: unresolved external symbol _png_set_filler r_model.obj : error LNK2001: unresolved external symbol _png_set_strip_16 r_model.obj : error LNK2001: unresolved external symbol _png_set_tRNS_to_alpha r_model.obj : error LNK2001: unresolved external symbol _png_get_valid r_model.obj : error LNK2001: unresolved external symbol _png_set_gray_1_2_4_to_8 r_model.obj : error LNK2001: unresolved external symbol _png_set_palette_to_rgb r_model.obj : error LNK2001: unresolved external symbol _png_get_color_type r_model.obj : error LNK2001: unresolved external symbol _png_get_bit_depth r_model.obj : error LNK2001: unresolved external symbol _png_get_image_height r_model.obj : error LNK2001: unresolved external symbol _png_get_image_width r_model.obj : error LNK2001: unresolved external symbol _png_read_info r_model.obj : error LNK2001: unresolved external symbol _png_set_read_fn r_model.obj : error LNK2001: unresolved external symbol _png_create_info_struct r_model.obj : error LNK2001: unresolved external symbol _png_create_read_struct r_model.obj : error LNK2001: unresolved external symbol _png_sig_cmp r_model.obj : error LNK2001: unresolved external symbol _png_get_io_ptr Debug/Vavoom95.exe : fatal error LNK1120: 20 unresolved externals Error executing link.exe. Vavoom95.exe - 21 error(s), 120 warning(s)
dj_jl
Firebrand
dj_jl
Firebrand
Compiling... r_model.cpp F:\Korax' Heritage\Vavoom\Source\vavoom\source\r_model.cpp(888) : warning C4611: interaction between '_setjmp' and C++ object destruction is non-portableThat's the only error I get from r_model.cpp and then come the linking errors I have detailed above.
dj_jl
Firebrand
Firebrand
Firebrand
- (.GetPlanePointZ) - TProgs::ExecuteFunction - (ExecuteLineSpecial) - VACS::RunScript - VACS::Tick - RunThinkers - P_Ticker - SV_Ticker - ServerFrame - Host_Frame Exiting due to external exceptionAlso I noticed that when teleporting you still keep your normal velocity, which is not the normal teleport behavior, you should lost it when teleporting, maybe something was moved with the teleporting for the new types of teleport spots, so far this is what I have noticed myself, I'll repost it on the Vavoom forums when you make the release, for now I just want to say that you are doing a great work on Vavoom Janis! <!-- s:D --><img src="{SMILIES_PATH}/icon_biggrin.gif" alt=":D" title="Very Happy" /><!-- s:D -->
Firebrand
dj_jl
I have been testing the games (mainly Heretic and Doom) and I found some bugs on the progs with the minotaur in Heretic, when the minotaur makes it's charge attack he flies away if he passes trough two sectors with different heights, I fixed this one <!-- s:wink: --><img src="{SMILIES_PATH}/icon_wink.gif" alt=":wink:" title="Wink" /><!-- s:wink: --> .Yeah, it looks like it bounces off the floor with 2 times more speed.
In Doom if you kill a flying monster it falls too quick (not like in ZDoom or the original), also fixed this one too.I must try this to see the difference.
And finally in Hexen the teleport bug I posted in my last post here is also fixed, you forgot a "!" in the last check for the teleport, fixed too <!-- s:wink: --><img src="{SMILIES_PATH}/icon_wink.gif" alt=":wink:" title="Wink" /><!-- s:wink: --> .I already fixed this a long time ago.
Firebrand
dj_jl
I have been playing around fixing some more stuff from the Vavoom progs, in Heretic I fixed the volcano blasts to fly correctly, it might not work exactly as in Heretic because I needed to turn on and off the bNoGravity flag in the projectiles, but I think it workd fine <!-- s:) --><img src="{SMILIES_PATH}/icon_smile.gif" alt=":)" title="Smile" /><!-- s:) -->,Hmmm, I'll chec it later. Maybe it's simplet to add more vertical force.
also in Heretic, I tweaked the distance in which the minotaur does the floor fire attack as it is in ZDoom (I really haven't check the value in the original Heretic source, but I think it works a bit better),192 / 256 = 0.75, so I don't see any difference here.
in Doom I fixed the status bar to look betterThat's cool.
and in Hexen I noticed that the Mage's lightning weapon did zigzag too much, that's because the zigzag count needs to be initialized in 0 (ZDoom and even the original Hexen source do it like this), I just added the line of code to initialize itThe memory for objects when created is initialised to zeroes, so it should be 0 already. I'll check if it's possible to be other than 0.
Firebrand
- TFlatTexture::GetPixels - VDirect3DDrawer::GenerateTexture - VDirect3DDrawer::SetTexture - R_PrecacheLevel - R_Start - CL_ParseServerInfo - CL_ParseServerMessage - CL_ReadFromServer - Host_Frame Exiting due to external exceptionI don't know if it's a problem with the textures or something else, oh, and before I forget, I had to made some changes to the "d3d_tex.cpp" and to the "r_tex.cpp", to compile the source without errors (I don't really remember which errors the compiler sent, but that might be a problem too).
dj_jl
Firebrand
? source/vavoom.aps Index: source/d3d_tex.cpp =================================================================== RCS file: /cvsroot/vavoom/vavoom/source/d3d_tex.cpp,v retrieving revision 1.26 diff -u -r1.26 d3d_tex.cpp --- source/d3d_tex.cpp 26 May 2005 16:50:14 -0000 1.26 +++ source/d3d_tex.cpp 8 Jun 2005 22:25:58 -0000 @@ -363,7 +363,7 @@ return; } - tex = GTextureManager.TextureAnimation(tex); + handle = GTextureManager.TextureAnimation(handle); if (!GTextureManager.Textures[handle]->DriverData) { Index: source/r_tex.cpp =================================================================== RCS file: /cvsroot/vavoom/vavoom/source/r_tex.cpp,v retrieving revision 1.30 diff -u -r1.30 r_tex.cpp --- source/r_tex.cpp 3 Jul 2005 12:06:56 -0000 1.30 +++ source/r_tex.cpp 3 Jul 2005 17:21:32 -0000 @@ -1097,7 +1097,7 @@ } byte* pPix = Pixels; - for (int i = 0; i < NumPixels; i++, pPix++) + for (i = 0; i < NumPixels; i++, pPix++) { *pPix = Remap[*pPix]; } @@ -1934,7 +1934,7 @@ best_dist = dist; } } - for (int i = 0; i < Width * Height; i++) + for (i = 0; i < Width * Height; i++) { if (Palette[Pixels].a == 0) Pixels = 0; @@ -2098,7 +2098,7 @@ best_dist = dist; } } - for (int i = 0; i < Width * Height; i++) + for (i = 0; i < Width * Height; i++) { if (Palette[Pixels].a == 0) Pixels = 0;There's not much changes, I just took out the "int" stuff from each for statement because the compiler said it was redefining an existing variable, that's all I also changed a "tex = GTextureManager.TextureAnimation(tex);" to "handle = GTextureManager.TextureAnimation(handle);", because the compiler said that the variable "tex" wasn't defined, I don't know if this change was right or not BTW.
dj_jl
Firebrand
Index: progs/heretic/game/Volcano.vc =================================================================== RCS file: /cvsroot/vavoom/vavoom/progs/heretic/game/Volcano.vc,v retrieving revision 1.1 diff -u -r1.1 Volcano.vc --- progs/heretic/game/Volcano.vc 26 Oct 2002 16:32:23 -0000 1.1 +++ progs/heretic/game/Volcano.vc 6 Jul 2005 13:28:07 -0000 @@ -59,7 +59,7 @@ blast.Angles.yaw = angle; blast.Velocity.x = cos(angle) * 35.0; blast.Velocity.y = sin(angle) * 35.0; - blast.Velocity.z = (2.5 + Random() * 4.0) * 35.0; + blast.Velocity.z = (7.5 + Random() * 12.0) * 35.0; blast.PlaySound('VolcanoBlast', CHAN_VOICE); blast.CheckMissileSpawn(); } Index: progs/heretic/game/VolcanoBlast.vc =================================================================== RCS file: /cvsroot/vavoom/vavoom/progs/heretic/game/VolcanoBlast.vc,v retrieving revision 1.1 diff -u -r1.1 VolcanoBlast.vc --- progs/heretic/game/VolcanoBlast.vc 26 Oct 2002 16:32:23 -0000 1.1 +++ progs/heretic/game/VolcanoBlast.vc 6 Jul 2005 13:28:21 -0000 @@ -70,7 +70,7 @@ tiny.Angles.yaw = angle; tiny.Velocity.x = 0.7 * cos(angle) * 35.0; tiny.Velocity.y = 0.7 * sin(angle) * 35.0; - tiny.Velocity.z = (1.0 + Random() * 2.0) * 35.0; + tiny.Velocity.z = (3.0 + Random() * 6.0) * 35.0; tiny.CheckMissileSpawn(); } }
dj_jl
Firebrand
Index: progs/hexen/game/Player.vc =================================================================== RCS file: /cvsroot/vavoom/vavoom/progs/hexen/game/Player.vc,v retrieving revision 1.8 diff -u -r1.8 Player.vc --- progs/hexen/game/Player.vc 28 Mar 2005 07:44:09 -0000 1.8 +++ progs/hexen/game/Player.vc 13 Jul 2005 22:56:59 -0000 @@ -1133,11 +1133,11 @@ { if (MorphTime) { - MO.Velocity.z = 6.0 * 35.0; + MO.Velocity.z = 6.5 * 35.0; } else { - MO.Velocity.z = 9.0 * 35.0; + MO.Velocity.z = 9.5 * 35.0; } MO.bOnMobj = false; JumpTime = 0.5;EDIT: BTW Janis, I don't want to bother you with this but, could you upload the new models you have made somewhere so I can give them a check? I'm a bit interested on that, but if you can't, no problem, I'll wait until the official release <!-- s:) --><img src="{SMILIES_PATH}/icon_smile.gif" alt=":)" title="Smile" /><!-- s:) --> .
dj_jl
Firebrand
Firebrand
? source/vavoom.aps Index: source/s_win32m.cpp =================================================================== RCS file: /cvsroot/vavoom/vavoom/source/s_win32m.cpp,v retrieving revision 1.11 diff -u -r1.11 s_win32m.cpp --- source/s_win32m.cpp 24 Sep 2004 10:54:11 -0000 1.11 +++ source/s_win32m.cpp 23 May 2005 13:59:35 -0000 @@ -25,7 +25,7 @@ // HEADER FILES ------------------------------------------------------------ -//#define TEST_MP3 +#define TEST_MP3 #include "winlocal.h" #include <dmusici.h> @@ -459,7 +459,7 @@ FL_FindFile(va("music/%s.ogg", song), RealName)) { StopMidiSong(); - fmodStream = FSOUND_Stream_OpenFile(RealName, FSOUND_NORMAL, 0); + fmodStream = FSOUND_Stream_Open(RealName, FSOUND_LOOP_NORMAL, 0, 0); if (!fmodStream) { GCon->Logf("Couldn't open %s", RealName); @@ -630,14 +630,10 @@ //************************************************************************** //** -//** qmus2mid.c -//** //** Quick MUS->MID ! by S.Bacquet //** //************************************************************************** -// HEADER FILES ------------------------------------------------------------ - // MACROS ------------------------------------------------------------------ #define MUSMAGIC "MUS\032" @@ -786,7 +782,7 @@ } while (1) { - TWriteByte(tracknum, (byte)(buffer & 0xff)); + TWriteByte(tracknum, buffer); if (buffer & 0x80) buffer >>= 8 ; else @@ -827,12 +823,13 @@ byte et; int MUSchannel; int MIDIchannel; - int MIDItrack; + int MIDItrack = 0; int NewEvent; int i; int event; int data; dword DeltaTime; + dword TotalTime = 0; byte MUS2MIDcontrol[15] = { 0, /* Program change - not a MIDI control change */ @@ -877,7 +874,7 @@ if (MUSh->channels > 15) /* <=> MUSchannels+drums > 16 */ { - GCon->Log(NAME_Dev, "Too many channels"); + GCon->Log(NAME_Dev,"Too meny channels"); return false; } @@ -898,7 +895,7 @@ { MIDIchannel = MUS2MIDchannel[MUSchannel] = (MUSchannel == 15 ? 9 : FirstChannelAvailable()); - MIDItrack = MIDIchan2track[MIDIchannel] = (byte)TrackCnt++; + MIDItrack = MIDIchan2track[MIDIchannel] = TrackCnt++; tracks[MIDItrack].data = (char *)Z_Malloc(TRACKBUFFERSIZE, PU_MUSIC, 0); } else @@ -967,7 +964,7 @@ break; case 5: case 7: - GCon->Log(NAME_Dev, "MUS file corupted"); + GCon->Log(NAME_Dev,"MUS file corupted"); return false; default: break; @@ -975,6 +972,7 @@ if (last(event)) { DeltaTime = ReadTime(&mus_ptr); + TotalTime += DeltaTime; for (i = 0; i < (int)TrackCnt; i++) tracks.DeltaTime += DeltaTime; } @@ -990,15 +988,15 @@ } } - for (i = 0; i < TrackCnt; i++) + for (i=0; i<TrackCnt; i++) { TWriteBuf(i, track_end, 4); } if (ouch) { - GCon->Log(NAME_Dev, "WARNING : There are bytes missing at the end."); - GCon->Log(NAME_Dev, "The end of the MIDI file might not fit the original one."); + GCon->Logf(NAME_Dev, "WARNING : There are bytes missing at the end."); + GCon->Logf(NAME_Dev, "The end of the MIDI file might not fit the original one."); } return true; @@ -1010,7 +1008,7 @@ // //========================================================================== -static void WriteBuf(const void *p, int size) +static void WriteBuf(void *p, int size) { memcpy(mid_file, p, size); mid_file += size; @@ -1073,7 +1071,7 @@ // //========================================================================== -static int qmus2mid(char *mus, char *mid, int length) +int qmus2mid(char *mus, char *mid, int length) { mid_file = mid;Hope that they are useful for you Janis <!-- s:) --><img src="{SMILIES_PATH}/icon_smile.gif" alt=":)" title="Smile" /><!-- s:) -->.
Firebrand
if (fabs((Actor(Other).Origin.z + Actor(Other).Height) - Actor(bombspot/*bombsource*/).Origin.z) > bombdistance) { // too high/low return true; }Just add this check to the PIT_RadiusAttack and it should work, it was the main problem the darkness missile and the poison cloud had to hit you when you were higher or lower than the projectiles. This seems to fix the problem.
Firebrand
- Z_Resize - VMMSystemMidiDevice::BuildFileIndex - VMMSystemMidiDevice::Play - PlaySong - COMMAND Music - Host_Frame Exiting due to external exceptionBTW, the new MIDI driver works really well <!-- s:) --><img src="{SMILIES_PATH}/icon_smile.gif" alt=":)" title="Smile" /><!-- s:) -->.
dj_jl
Firebrand
Firebrand
Firebrand
- VStreamMusicPlayer::Tick - S_UpdateSounds - Host_Frame Exiting due to external exceptionIt seems a problem with the recent changes, if you run the game without music it runs fine.
dj_jl
Firebrand
ndex: Vavoom95/Vavoom95.dsp =================================================================== RCS file: /cvsroot/vavoom/vavoom/msvc/Vavoom95/Vavoom95.dsp,v retrieving revision 1.2 diff -u -r1.2 Vavoom95.dsp --- Vavoom95/Vavoom95.dsp 22 Mar 2005 07:50:40 -0000 1.2 +++ Vavoom95/Vavoom95.dsp 31 Oct 2005 16:34:58 -0000 @@ -43,7 +43,7 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /W4 /GX /O2 /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /YX /FD /c +# ADD CPP /nologo /MT /W4 /GX /O2 /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /YX /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x426 /d "NDEBUG" @@ -53,7 +53,8 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386 -# ADD LINK32 kernel32.lib user32.lib gdi32.lib ole32.lib winmm.lib opengl32.lib openal32.lib wsock32.lib libpng.lib /nologo /subsystem:windows /machine:I386 +# ADD LINK32 kernel32.lib user32.lib gdi32.lib ole32.lib winmm.lib opengl32.lib openal32.lib wsock32.lib libpng.lib zlib.lib libmad.lib vorbis_static.lib ogg_static.lib mikmod.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"msvcrt.lib" /nodefaultlib:"libcd.lib" /nodefaultlib:"libcmtd.lib" /nodefaultlib:"msvcrtd.lib" /libpath:"C:\Gamma\Microsoft Visual C++ Toolkit 2003\lib" +# SUBTRACT LINK32 /pdb:none !ELSEIF "$(CFG)" == "Vavoom95 - Win32 Debug" @@ -79,8 +80,8 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept -# ADD LINK32 kernel32.lib user32.lib gdi32.lib ole32.lib winmm.lib opengl32.lib openal32.lib wsock32.lib libpng.lib /nologo /subsystem:windows /debug /machine:I386 -# SUBTRACT LINK32 /profile +# ADD LINK32 kernel32.lib user32.lib gdi32.lib ole32.lib winmm.lib opengl32.lib openal32.lib wsock32.lib libpng.lib fmodvc.lib zlib.lib /nologo /subsystem:windows /debug /machine:I386 +# SUBTRACT LINK32 /pdb:none !ENDIF @@ -370,6 +371,10 @@ SOURCE=..\..\source\vavoom_2.ico # End Source File +# Begin Source File + +SOURCE=..\..\source\vavoom_3.ico +# End Source File # End Group # Begin Group "Assembler Files" @@ -1652,11 +1657,6 @@ # End Source File # Begin Source File -SOURCE=..\..\source\qmus2mid.cpp -# PROP Exclude_From_Build 1 -# End Source File -# Begin Source File - SOURCE=..\..\source\s_al.cpp # End Source File # Begin Source File @@ -1684,6 +1684,14 @@ # End Source File # Begin Source File +SOURCE=..\..\source\s_mikmod.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\source\s_mp3.cpp +# End Source File +# Begin Source File + SOURCE=..\..\source\s_sdl.cpp # PROP Exclude_From_Build 1 # End Source File @@ -1699,6 +1707,14 @@ # End Source File # Begin Source File +SOURCE=..\..\source\s_tmidty.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\source\s_vorbis.cpp +# End Source File +# Begin Source File + SOURCE=..\..\source\s_win32.cpp # ADD CPP /W4 # End Source File @@ -2093,5 +2109,101 @@ SOURCE=..\..\source\winlocal.h # End Source File # End Group +# Begin Group "Timidity Driver" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=..\..\source\timidity\common.c +# End Source File +# Begin Source File + +SOURCE=..\..\source\timidity\common.h +# End Source File +# Begin Source File + +SOURCE=..\..\source\timidity\config.h +# End Source File +# Begin Source File + +SOURCE=..\..\source\timidity\controls.c +# End Source File +# Begin Source File + +SOURCE=..\..\source\timidity\controls.h +# End Source File +# Begin Source File + +SOURCE=..\..\source\timidity\filter.c +# End Source File +# Begin Source File + +SOURCE=..\..\source\timidity\filter.h +# End Source File +# Begin Source File + +SOURCE=..\..\source\timidity\instrum.c +# End Source File +# Begin Source File + +SOURCE=..\..\source\timidity\instrum.h +# End Source File +# Begin Source File + +SOURCE=..\..\source\timidity\mix.c +# End Source File +# Begin Source File + +SOURCE=..\..\source\timidity\mix.h +# End Source File +# Begin Source File + +SOURCE=..\..\source\timidity\output.c +# End Source File +# Begin Source File + +SOURCE=..\..\source\timidity\output.h +# End Source File +# Begin Source File + +SOURCE=..\..\source\timidity\playmidi.c +# End Source File +# Begin Source File + +SOURCE=..\..\source\timidity\playmidi.h +# End Source File +# Begin Source File + +SOURCE=..\..\source\timidity\readmidi.c +# End Source File +# Begin Source File + +SOURCE=..\..\source\timidity\readmidi.h +# End Source File +# Begin Source File + +SOURCE=..\..\source\timidity\resample.c +# End Source File +# Begin Source File + +SOURCE=..\..\source\timidity\resample.h +# End Source File +# Begin Source File + +SOURCE=..\..\source\timidity\tables.c +# End Source File +# Begin Source File + +SOURCE=..\..\source\timidity\tables.h +# End Source File +# Begin Source File + +SOURCE=..\..\source\timidity\timidity.c +# End Source File +# Begin Source File + +SOURCE=..\..\source\timidity\timidity.h +# End Source File +# End Group # End Target # End Project
dj_jl
Firebrand
ndex: s_win32.cpp =================================================================== RCS file: /cvsroot/vavoom/vavoom/source/s_win32.cpp,v retrieving revision 1.30 diff -u -r1.30 s_win32.cpp --- s_win32.cpp 5 Nov 2005 15:50:07 -0000 1.30 +++ s_win32.cpp 6 Nov 2005 17:31:00 -0000 @@ -564,7 +564,7 @@ // //========================================================================== -static LPDIRECTSOUNDBUFFER CreateBuffer(int sound_id, const char *VoiceName) +static LPDIRECTSOUNDBUFFER CreateBuffer(int sound_id) { HRESULT result; LPDIRECTSOUNDBUFFER dsbuffer; @@ -599,12 +599,12 @@ } // Check, that sound lump is loaded - if (!S_LoadSound(sound_id, VoiceName)) + if (!S_LoadSound(sound_id)) { // Missing sound. return NULL; } - sfxinfo_t &sfx = VoiceName ? S_VoiceInfo : S_sfx[sound_id]; + sfxinfo_t &sfx = /*VoiceName ? S_VoiceInfo :*/ S_sfx[sound_id]; // Set up wave format structure. memset(&pcmwf, 0, sizeof(WAVEFORMATEX)); @@ -728,7 +728,7 @@ return; //no free channels. } - dsbuffer = CreateBuffer(sound_id, NULL); + dsbuffer = CreateBuffer(sound_id); if (!dsbuffer) { return; @@ -836,7 +836,7 @@ S_StopAllSound(); // Create buffer - dsbuffer = CreateBuffer(sound_id, NULL); + dsbuffer = CreateBuffer(sound_id); if (!dsbuffer) { return;
Index: s_data.cpp =================================================================== RCS file: /cvsroot/vavoom/vavoom/source/s_data.cpp,v retrieving revision 1.14 diff -u -r1.14 s_data.cpp --- s_data.cpp 5 Nov 2005 15:50:07 -0000 1.14 +++ s_data.cpp 6 Nov 2005 17:20:42 -0000 @@ -68,6 +68,8 @@ void S_InitScript(void) { + int Lump; + guard(S_InitScript); // // Allocate memory for sound info @@ -110,7 +112,7 @@ SC_Close(); // Add Strife voices. - for (int Lump = W_IterateNS(-1, WADNS_Voices); Lump >= 0; + for (Lump = W_IterateNS(-1, WADNS_Voices); Lump >= 0; Lump = W_IterateNS(Lump, WADNS_Voices)) { char SndName[16]; @@ -130,7 +132,7 @@ // // Load script SNDINFO // - for (int Lump = W_IterateNS(-1, WADNS_Global); Lump >= 0; + for (Lump = W_IterateNS(-1, WADNS_Global); Lump >= 0; Lump = W_IterateNS(Lump, WADNS_Global)) { if (!stricmp(W_LumpName(Lump), "sndinfo"))
dj_jl
Firebrand
dj_jl
Firebrand
Unhandled exception at 0x004151fd in Vavoom95.exe: 0xC0000005: Access violation reading location 0x00000bfc.This is the call stack contents of the error:
> Vavoom95.exe!FName::operator*() Line 86 + 0x10 C++ Vavoom95.exe!TTextureManager::CheckNumForName(FName Name={...}, int Type=2, unsigned char bOverload='', unsigned char bCheckAny=0) Line 404 + 0x8 C++ Vavoom95.exe!ParseMapInfo() Line 302 + 0x24 C++ Vavoom95.exe!InitMapInfo() Line 165 C++ Vavoom95.exe!Host_Init() Line 162 C++ Vavoom95.exe!WinMain(HINSTANCE__ * hInstance=0x00400000, HINSTANCE__ * __formal=0x00000000, HINSTANCE__ * __formal=0x00000000, int iCmdShow=10) Line 813 C++ Vavoom95.exe!_WinMainCRTStartup() + 0xe0 kernel32.dll!7c816d4f() kernel32.dll!7c8399f3()Hope it's enough to fix the problem or at least orient me on a way to fix it. Thanks!
dj_jl
SC_OpenLump("mapinfo"); ParseMapInfo();
Firebrand
dj_jl
Yes, that helped me to start Vavoom normally, I think there's a problem with the code there, how about making the MAPINFO lump additvie, i.e. it loads the data it finds from each MAPINFO lump, so if you declare a MAP01 in one MAPINFO lump and a MAP02 in another one (different PWAD for example), it loads both maps? I think it's overwriting the info found in the different lumps maybe.That's how it's suposed to work. For some reason it doesn't want to work for you.
EDIT: Would it be possible to do the same with SNDINFO entries? I had to copy all the sounds from hexen to define new song lumps for the maps in a test i made.I already implemented this some time ago.
Firebrand
EDIT: Would it be possible to do the same with SNDINFO entries? I had to copy all the sounds from hexen to define new song lumps for the maps in a test i made.I already implemented this some time ago. OK, I didn't knew, I'll check my test map, maybe I made something wrong.
Firebrand
--------------------Configuration: Vavoom95 - Win32 Debug-------------------- Compiling... mapinfo.cpp E:\Korax\Vavoom\New_Source\vavoom\source\mapinfo.cpp(34) : warning C4005: 'MAPINFO_SCRIPT_NAME' : macro redefinition e:\korax\vavoom\new_source\vavoom\source\mapinfo.cpp(0) : see previous definition of 'MAPINFO_SCRIPT_NAME'I know it's something really stupid, considering that the macro it's only defined in that file. EDIT: I don't think it's the cause of the problem, because I also tried the fix you proposed using this lines of code:
if (!stricmp(W_LumpName(Lump), "mapinfo")) { SC_OpenLumpNum(Lump); ParseMapInfo(); }Which it's still very strange...
dj_jl
Firebrand
Firebrand
- S_GetSoundPlayingInfo - SN_UpdateActiveSequences - S_UpdateSounds - Host_Frame Exiting due to external exceptionBTW, I made the Strife intro to work as in the original game, here's the patch for it:
Index: progs/strife/client/title.vc =================================================================== RCS file: /cvsroot/vavoom/vavoom/progs/strife/client/title.vc,v retrieving revision 1.7 diff -u -r1.7 title.vc --- progs/strife/client/title.vc 5 Nov 2005 15:50:55 -0000 1.7 +++ progs/strife/client/title.vc 11 Nov 2005 14:00:53 -0000 @@ -57,52 +57,59 @@ switch (demosequence) { case 0: - pagetime = 5.0; + pagetime = 12.0; page_pic = R_RegisterPic("TITLEPIC", PIC_PATCH); CmdBuf_AddText("music play d_logo"); break; case 1: + pagetime = 5.0; + page_pic = R_RegisterPic("RGELOGO", PIC_PATCH); + LocalSound('CrusaderActive'); + break; + + case 2: + CmdBuf_AddText("music play d_intro"); pagetime = 7.0; page_pic = R_RegisterPic("PANEL1", PIC_PATCH); LocalSound('svox/pro1'); break; - case 2: + case 3: pagetime = 9.0; page_pic = R_RegisterPic("PANEL2", PIC_PATCH); LocalSound('svox/pro2'); break; - case 3: + case 4: pagetime = 12.0; page_pic = R_RegisterPic("PANEL3", PIC_PATCH); LocalSound('svox/pro3'); break; - case 4: + case 5: pagetime = 11.0; page_pic = R_RegisterPic("PANEL4", PIC_PATCH); LocalSound('svox/pro4'); break; - case 5: + case 6: pagetime = 10.0; page_pic = R_RegisterPic("PANEL5", PIC_PATCH); LocalSound('svox/pro5'); break; - case 6: + case 7: pagetime = 16.0; page_pic = R_RegisterPic("PANEL6", PIC_PATCH); LocalSound('svox/pro6'); break; - case 7: + case 9: CmdBuf_AddText("PlayDemo demo1\n"); break; - case 8: + case 10: pagetime = 6.0; page_pic = R_RegisterPic("CREDIT", PIC_PATCH); break;Also, there are some super shotgun sounds missing from the Doom2 SNDINFO lump (or maybe not renamed).
dj_jl
I got this error when I applied the latest Vavoom changes in Hexen MAP01:Fixed.
BTW, I made the Strife intro to work as in the original gameThat's cool.
Also, there are some super shotgun sounds missing from the Doom2 SNDINFO lump (or maybe not renamed).Missed one sound while renaming.
Firebrand
RCS file: /cvsroot/vavoom/vavoom/progs/strife/client/statbar.vc,v retrieving revision 1.14 diff -u -r1.14 statbar.vc --- progs/strife/client/statbar.vc 6 Nov 2005 19:11:13 -0000 1.14 +++ progs/strife/client/statbar.vc 19 Nov 2005 11:51:30 -0000 @@ -211,8 +211,8 @@ pic_ammo[am_clip] = R_RegisterPic("BLITA0", PIC_PATCH); - pic_ammo[am_electric_arrow] = R_RegisterPic("PQRLA0", PIC_PATCH); - pic_ammo[am_poison_arrow] = R_RegisterPic("XQRLA0", PIC_PATCH); + pic_ammo[am_electric_arrow] = R_RegisterPic("XQRLA0", PIC_PATCH); + pic_ammo[am_poison_arrow] = R_RegisterPic("PQRLA0", PIC_PATCH); pic_ammo[am_cell] = R_RegisterPic("CPACA0", PIC_PATCH);Also, there was a small issue in the wad.c file from the GLBSP source, here's the fix for it:
RCS file: /cvsroot/vavoom/vavoom/utils/glbsp/wad.c,v retrieving revision 1.8 diff -u -r1.8 wad.c --- utils/glbsp/wad.c 13 Nov 2005 19:45:55 -0000 1.8 +++ utils/glbsp/wad.c 18 Nov 2005 00:58:32 -0000 @@ -1632,13 +1632,10 @@ void ReportV5Switches(void) { lump_t *cur; + int saw_zdbsp = FALSE; PrintMsg( "V5 FORMAT UPGRADES. The following levels require a Doom port\n" "which supports V5 GL-Nodes, otherwise they will fail (or crash).\n\n" ); - int saw_zdbsp = FALSE; PrintMsg( "V5 FORMAT UPGRADES. The following levels require a Doom port\n"
Firebrand
Index: source/r_main.cpp =================================================================== RCS file: /cvsroot/vavoom/vavoom/source/r_main.cpp,v retrieving revision 1.29 diff -u -r1.29 r_main.cpp --- source/r_main.cpp 13 Nov 2005 18:44:55 -0000 1.29 +++ source/r_main.cpp 28 Nov 2005 18:18:49 -0000 @@ -212,7 +212,7 @@ COMMAND(SizeDown) { R_SetViewSize(screenblocks - 1); - S_StartSoundName("MenuSwitch"); + S_StartSoundName("menu/change"); } //========================================================================== @@ -224,7 +224,7 @@ COMMAND(SizeUp) { R_SetViewSize(screenblocks + 1); - S_StartSoundName("MenuSwitch"); + S_StartSoundName("menu/change"); }Also, the VCC source code had some compiling problems I fixed, here are the diffs for them:
Index: utils/vcc/expressn.cpp =================================================================== RCS file: /cvsroot/vavoom/vavoom/utils/vcc/expressn.cpp,v retrieving revision 1.31 diff -u -r1.31 expressn.cpp --- utils/vcc/expressn.cpp 30 Nov 2005 23:55:05 -0000 1.31 +++ utils/vcc/expressn.cpp 1 Dec 2005 16:02:52 -0000 @@ -481,8 +481,8 @@ ERR_Exit(ERR_ILLEGAL_EXPR_IDENT, true, "Identifier: %s", *Name); break; - default: - break; +/* default: + break;*/ }
Index: utils/vcc/pcode.cpp =================================================================== RCS file: /cvsroot/vavoom/vavoom/utils/vcc/pcode.cpp,v retrieving revision 1.23 diff -u -r1.23 pcode.cpp --- utils/vcc/pcode.cpp 30 Nov 2005 23:55:05 -0000 1.23 +++ utils/vcc/pcode.cpp 1 Dec 2005 16:02:52 -0000 @@ -408,9 +408,10 @@ void EndCode(int FuncNum) { + int i; functions[FuncNum].FirstStatement = CodeBufferSize; - for (int i = 0; i < NumInstructions; i++) + for (i = 0; i < NumInstructions; i++) { Instructions.Address = CodeBufferSize; CodeBuffer[CodeBufferSize++] = Instructions.Opcode; @@ -424,7 +425,7 @@ } Instructions[NumInstructions].Address = CodeBufferSize; - for (int i = 0; i < NumInstructions; i++) + for (i = 0; i < NumInstructions; i++) { switch (Instructions.Opcode) {
Firebrand
Firebrand
- VRootWindow::StaticInit - Host_Init ERROR: PR_GlobalNumForName: global GRoot not foundAlso, I have uploaded a couple of screenshots showing a problem with the Direct3D renderer (I don't really know what's the problem), it has happened since some time now, I haven't really made a test using the latest Vavoom version (not compiled by me), I'll do it ASAP and post the results here too. [url:4x7id99q]http://downloads.orcishweb.com/koraxdev/vavoom/screenshots/shot0000.png [url:4x7id99q]http://downloads.orcishweb.com/koraxdev/vavoom/screenshots/shot0001.png [url:4x7id99q]http://downloads.orcishweb.com/koraxdev/vavoom/screenshots/shot0002.png
RambOrc
Firebrand
RambOrc
Firebrand
dj_jl
first problem, I got the latest Vavoom changes, but when I run the game it exits with this errorForgot to commit engine part of the changes.
Also, I have uploaded a couple of screenshots showing a problem with the Direct3D rendererIf it works in OpenGL, that means it's a problem in driver. But I haven't changed anything there. When I'll have time to boot Windows, I'll check how it works for me.
Firebrand
RCS file: /cvsroot/vavoom/vavoom/progs/doom/game/Actor.vc,v retrieving revision 1.20 diff -u -r1.20 Actor.vc --- progs/doom/game/Actor.vc 12 Dec 2005 20:33:49 -0000 1.20 +++ progs/doom/game/Actor.vc 21 Dec 2005 22:02:42 -0000 @@ -1611,27 +1611,28 @@ bOnMobj = false; } } - else if (bIsPlayer) + else { - if (Velocity.z < -GRAVITY * 0.25 && !bFly) + if (bIsPlayer) { - PlayerLandedOnThing(); + if (Velocity.z < -GRAVITY * 0.25 && !bFly) + { + PlayerLandedOnThing(); + } } if (onmo.Origin.z + onmo.Height - Origin.z <= MaxStepHeight) { - Player.ViewHeight -= - onmo.Origin.z + onmo.Height - Origin.z; - Player.DeltaViewHeight = - (VIEWHEIGHT - Player.ViewHeight) * 4.0; + if (bIsPlayer) + { + Player.ViewHeight -= + onmo.Origin.z + onmo.Height - Origin.z; + Player.DeltaViewHeight = + (VIEWHEIGHT - Player.ViewHeight) * 4.0; + } Origin.z = onmo.Origin.z + onmo.Height; - bOnMobj = true; - Velocity.z = 0.0; - } - else - { - // hit the bottom of the blocking actor - Velocity.z = 0.0; } + bOnMobj = true; + Velocity.z = 0.0; } }I discovered it long time ago when playing doom and in KA frozen things would make you stuck because they won't explode if they are above your head, that was what make me look for a solution BTW, heh!
dj_jl
Firebrand
Firebrand
Loaded MAP04, 4855 vertexes, 9881 segs, 1970 subsectors, 7222 portals - W_BuildGLNodes - VLevel::LoadMap - SV_LoadLevel - SV_SpawnServer - COMMAND Map - Host_Frame ERROR: Leaf portals saw into leafMaybe there's something wrong with the latest GLBSP changes and how GLVIS works now.
dj_jl
Firebrand
Firebrand
Firebrand
dj_jl
Firebrand
RambOrc
Firebrand
Firebrand
RCS file: /cvsroot/vavoom/vavoom/progs/hexen/game/LightningMissile.vc,v retrieving revision 1.2 diff -u -r1.2 LightningMissile.vc --- progs/hexen/game/LightningMissile.vc 8 Mar 2003 12:41:43 -0000 1.2 +++ progs/hexen/game/LightningMissile.vc 10 Jan 2006 22:16:03 -0000 @@ -142,7 +142,11 @@ if (Class == LightningFloor) { - Origin.z = FloorZ; + if(Sector->bHasExtrafloors && LightningLink && Instigator.Origin.z >= LightningLink.FloorZ) + Origin.z = LightningLink.FloorZ; + else + Origin.z = FloorZ; + if (LightningLink) targ = LightningLink.Enemy; else @@ -150,9 +154,14 @@ } else if (Class == LightningCeiling) { - Origin.z = CeilingZ - Height; + if(Sector->bHasExtrafloors && LightningLink && Instigator.Origin.z <= LightningLink.CeilingZ) + Origin.z = LightningLink.CeilingZ - Height; + else + Origin.z = CeilingZ - Height; + targ = Enemy; } + if (Class == LightningFloor) {
dj_jl
Firebrand
0x4000000 (64.000000 meg) allocated for zone, ZoneBase: 0x1D60020 - Host_Init Exiting due to external exceptionMaybe something to do with the changes for other OS's.
dj_jl
Firebrand
- (.P_PathTraverse) - TProgs::ExecuteFunction - (Player.PlayerTick) - SV_RunClients - SV_Ticker - ServerFrame - Host_Frame ERROR: Function TraceTraverse not foundSeems that there are some missing functions somewhere.
dj_jl
Firebrand
dj_jl
Firebrand
dj_jl
dj_jl
Firebrand
- (MenuScreenControls.CursorMoved) - TProgs::ExecuteFunction - (MenuScreen.InitWindow) - VWindow::Init - VWindow::CreateNewWindow - (MenuScreenControls2) - TProgs::ExecuteFunction - (ClientGame.MenuResponder) - IN_ProcessEvents - Host_Frame Exiting due to external exception
dj_jl
Firebrand
- (Object.VectorAngles) - RunFunction - (Object.VectorAngles 8928117) - RunFunction - (HexenLevelInfo.SpawnMapThing 319) - TProgs::ExecuteFunction - (HexenLevelInfo.SpawnMapThing) - SV_SpawnServer - COMMAND Map - Host_Frame Exiting due to external exceptionThis error also happens in Strife and Doom. In heretic, the game crashed in the D'Sparil's map, saying that there's no BossSpot class.
dj_jl
Firebrand
dj_jl
Firebrand
Firebrand
- COMMAND Spawn - SV_RunClientCommand - SV_ReadClientMessages - SV_RunClients - SV_Ticker - ServerFrame - Host_Frame Exiting due to external exceptionStarting a game and exiting maps normally doesn't seem to have any problems.
dj_jl
Firebrand
dj_jl
Firebrand
Firebrand
Compiling... s_flac.cpp \vavoom\source\s_flac.cpp(43) : error C2086: 'Stream' : redefinition \Vavoom\vavoom\source\s_flac.cpp(62) : warning C4511: 'FStream' : copy constructor could not be generated \Vavoom\vavoom\source\s_flac.cpp(40) : see declaration of 'FStream' \Vavoom\vavoom\source\s_flac.cpp(73) : error C2086: 'Stream' : redefinition \Vavoom\vavoom\source\s_flac.cpp(100) : warning C4511: 'FStream' : copy constructor could not be generated \Vavoom\vavoom\source\s_flac.cpp(70) : see declaration of 'FStream' \Vavoom\vavoom\source\s_flac.cpp(179) : error C2664: '__thiscall FLAC::Decoder::Stream::FLAC::Decoder::Stream(const class FLAC::Decoder::Stream &)' : cannot convert parameter 1 from 'class VStream' to 'const class FLAC::Decoder::Stream &' Reason: cannot convert from 'class VStream' to 'const class FLAC::Decoder::Stream' No constructor could take the source type, or constructor overload resolution was ambiguous \Vavoom\vavoom\source\s_flac.cpp(181) : error C2039: 'Seek' : is not a member of 'Stream' \MVS\VC98\INCLUDE\FLAC++/decoder.h(91) : see declaration of 'Stream' \Vavoom\vavoom\source\s_flac.cpp(182) : error C2039: 'TotalSize' : is not a member of 'Stream' \MVS\VC98\INCLUDE\FLAC++/decoder.h(91) : see declaration of 'Stream' \Vavoom\vavoom\source\s_flac.cpp(208) : error C2039: 'Serialise' : is not a member of 'Stream' \MVS\VC98\INCLUDE\FLAC++/decoder.h(91) : see declaration of 'Stream' \Vavoom\vavoom\source\s_flac.cpp(376) : error C2273: 'function-style cast' : illegal as right side of '->' operator \Vavoom\vavoom\source\s_flac.cpp(376) : error C2227: left of '->Seek' must point to class/struct/union \Vavoom\vavoom\source\s_flac.cpp(377) : error C2273: 'function-style cast' : illegal as right side of '->' operator \Vavoom\vavoom\source\s_flac.cpp(377) : error C2227: left of '->TotalSize' must point to class/struct/union \Vavoom\vavoom\source\s_flac.cpp(398) : error C2664: '__thiscall FLAC::Decoder::Stream::FLAC::Decoder::Stream(const class FLAC::Decoder::Stream &)' : cannot convert parameter 1 from 'class VStream *' to 'const class FLAC::Decoder::Stream &' Reason: cannot convert from 'class VStream *' to 'const class FLAC::Decoder::Stream' No constructor could take the source type, or constructor overload resolution was ambiguous \Vavoom\vavoom\source\s_flac.cpp(400) : error C2327: 'VFlacAudioCodec::Stream' : member from enclosing class is not a type name, static, or enumerator \Vavoom\vavoom\source\s_flac.cpp(400) : error C2327: 'VFlacAudioCodec::Stream' : member from enclosing class is not a type name, static, or enumerator \Vavoom\vavoom\source\s_flac.cpp(400) : error C2819: type 'FLAC::Decoder::Stream' does not have an overloaded member 'operator ->' \MVS\VC98\INCLUDE\FLAC++/decoder.h(91) : see declaration of 'Stream' \Vavoom\vavoom\source\s_flac.cpp(400) : error C2227: left of '->Seek' must point to class/struct/union \Vavoom\vavoom\source\s_flac.cpp(401) : error C2819: type 'FLAC::Decoder::Stream' does not have an overloaded member 'operator ->' \MVS\VC98\INCLUDE\FLAC++/decoder.h(91) : see declaration of 'Stream' \Vavoom\vavoom\source\s_flac.cpp(401) : error C2227: left of '->TotalSize' must point to class/struct/union \Vavoom\vavoom\source\s_flac.cpp(420) : error C2327: 'VFlacAudioCodec::Stream' : member from enclosing class is not a type name, static, or enumerator \Vavoom\vavoom\source\s_flac.cpp(420) : error C2327: 'VFlacAudioCodec::Stream' : member from enclosing class is not a type name, static, or enumerator \Vavoom\vavoom\source\s_flac.cpp(420) : error C2819: type 'FLAC::Decoder::Stream' does not have an overloaded member 'operator ->' \MVS\VC98\INCLUDE\FLAC++/decoder.h(91) : see declaration of 'Stream' \Vavoom\vavoom\source\s_flac.cpp(420) : error C2227: left of '->Close' must point to class/struct/union \Vavoom\vavoom\source\s_flac.cpp(421) : error C2541: delete : cannot delete objects that are not pointers \Vavoom\vavoom\source\s_flac.cpp(482) : error C2327: 'VFlacAudioCodec::Stream' : member from enclosing class is not a type name, static, or enumerator \Vavoom\vavoom\source\s_flac.cpp(482) : error C2819: type 'FLAC::Decoder::Stream' does not have an overloaded member 'operator ->' \MVS\VC98\INCLUDE\FLAC++/decoder.h(91) : see declaration of 'Stream' \Vavoom\vavoom\source\s_flac.cpp(482) : error C2227: left of '->Serialise' must point to class/struct/unionFor me, it seems as if the Stream member of the FStream class was being took as something else, maybe try to rename it to something else?
Firebrand
RCS file: /cvsroot/vavoom/vavoom/source/s_flac.cpp,v retrieving revision 1.4 diff -u -r1.4 s_flac.cpp --- source/s_flac.cpp 22 Feb 2006 20:33:51 -0000 1.4 +++ source/s_flac.cpp 25 Feb 2006 18:53:26 -0000 @@ -40,7 +40,7 @@ class FStream : public FLAC::Decoder::Stream { public: - VStream& Stream; + VStream& FStrm; size_t BytesLeft; int SampleBits; int SampleRate; @@ -70,7 +70,7 @@ class FStream : public FLAC::Decoder::Stream { public: - VStream* Stream; + VStream* FStrm; size_t BytesLeft; int NumChannels; int SampleBits; @@ -171,15 +171,15 @@ //========================================================================== VFlacSampleLoader::FStream::FStream(VStream& InStream) -: Stream(InStream) +: FStrm(InStream) , SampleBits(0) , SampleRate(0) , Data(0) , DataSize(0) { guard(VFlacSampleLoader::FStream::FStream); - Stream.Seek(0); - BytesLeft = Stream.TotalSize(); + FStrm.Seek(0); + BytesLeft = FStrm.TotalSize(); unguard; } @@ -205,7 +205,7 @@ { *bytes = BytesLeft; } - Stream.Serialise(buffer, *bytes); + FStrm.Serialise(buffer, *bytes); BytesLeft -= *bytes; return FLAC__STREAM_DECODER_READ_STATUS_CONTINUE; } @@ -373,8 +373,8 @@ void VFlacAudioCodec::Restart() { guard(VFlacAudioCodec::Restart); - Stream->Stream->Seek(0); - Stream->BytesLeft = Stream->Stream->TotalSize(); + Stream->FStrm->Seek(0); + Stream->BytesLeft = Stream->FStrm->TotalSize(); Stream->reset(); unguard; } @@ -386,7 +386,7 @@ //========================================================================== VFlacAudioCodec::FStream::FStream(VStream* InStream) -: Stream(InStream) +: FStrm(InStream) , NumChannels(0) , SampleBits(0) , SampleRate(0) @@ -397,8 +397,8 @@ , StrmSize(0) { guard(VFlacAudioCodec::FStream::FStream); - Stream->Seek(0); - BytesLeft = Stream->TotalSize(); + FStrm->Seek(0); + BytesLeft = FStrm->TotalSize(); init(); process_until_end_of_metadata(); unguard; @@ -417,8 +417,8 @@ { Z_Free(SamplePool[0]); SamplePool[0] = NULL; - Stream->Close(); - delete Stream; + FStrm->Close(); + delete FStrm; } unguard; } @@ -479,7 +479,7 @@ { *bytes = BytesLeft; } - Stream->Serialise(buffer, *bytes); + FStrm->Serialise(buffer, *bytes); BytesLeft -= *bytes; return FLAC__STREAM_DECODER_READ_STATUS_CONTINUE; }
dj_jl
Firebrand
sv_save.cpp \Vavoom\vavoom\source\sv_save.cpp(128) : error C2555: 'VSaveLoaderStream::<<' : overriding virtual function differs from 'VStream::<<' only by return type or calling convention \Vavoom\vavoom\source\stream.h(36) : see declaration of 'VStream' \Vavoom\vavoom\source\sv_save.cpp(219) : error C2555: 'VSaveWriterStream::<<' : overriding virtual function differs from 'VStream::<<' only by return type or calling convention \Vavoom\vavoom\source\stream.h(36) : see declaration of 'VStream'Again, it might need some renaming, or maybe doing a casting to solve the problem.
dj_jl
Firebrand
0x8000000 (128.000000 meg) allocated for zone, ZoneBase: 0x1D10020 - FL_Init - Host_Init Exiting due to external exceptionThe exams week made me forget to post a small fix for the "types.cpp" file from VCC, it fixes some compiling problems with M$VC, here it is <!-- s:) --><img src="{SMILIES_PATH}/icon_smile.gif" alt=":)" title="Smile" /><!-- s:) -->.
RCS file: /cvsroot/vavoom/vavoom/utils/vcc/types.cpp,v retrieving revision 1.46 diff -u -r1.46 types.cpp --- utils/vcc/types.cpp 28 Feb 2006 19:17:20 -0000 1.46 +++ utils/vcc/types.cpp 1 Mar 2006 02:55:55 -0000 @@ -232,19 +232,21 @@ TType CheckForType(TClass* InClass) { + int i; + if (tk_Token == TK_KEYWORD) { return CheckForTypeKeyword(); } - for (int i = 0; i < classtypes.Num(); i++) + for (i = 0; i < classtypes.Num(); i++) { if (TK_Check(classtypes->Name)) { return TType(classtypes); } } - for (int i = 0; i < structtypes.Num(); i++) + for (i = 0; i < structtypes.Num(); i++) { if (structtypes->OuterClass == InClass && TK_Check(structtypes->Name)) { @@ -266,19 +268,21 @@ TType CheckForType(TClass* InClass, VName Name) { + int i; + if (Name == NAME_None) { return TType(ev_unknown); } - for (int i = 0; i < classtypes.Num(); i++) + for (i = 0; i < classtypes.Num(); i++) { if (Name == classtypes->Name) { return TType(classtypes); } } - for (int i = 0; i < structtypes.Num(); i++) + for (i = 0; i < structtypes.Num(); i++) { if (structtypes->OuterClass == InClass && Name == structtypes->Name) { @@ -564,6 +568,8 @@ void TType::GetName(char* Dest) const { + int i; + switch (type) { case ev_int: strcpy(Dest, "int"); break; @@ -571,7 +577,7 @@ case ev_name: strcpy(Dest, "name"); break; case ev_string: strcpy(Dest, "string"); break; case ev_pointer: GetPointerInnerType().GetName(Dest); - for (int i = 0; i < PtrLevel; i++) strcat(Dest, "*"); break; + for (i = 0; i < PtrLevel; i++) strcat(Dest, "*"); break; case ev_reference: strcpy(Dest, Class ? *Class->Name : "none"); break; case ev_array: GetArrayInnerType().GetName(Dest); strcat(Dest, "[]"); break; case ev_struct: strcpy(Dest, *Struct->Name); break;
Firebrand
Log: Can't close ./doom2.gwa, some lumps are in use Log: PVS build not performed Dev: Client level loadedSomething might be wrong with it somehow.
dj_jl