OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- Split off the entire translation code from r_draw.cpp into r_translate.cpp.

Browse source 
- Moved the common code of ACS and DECORATE translation generation into the
  FRemapTable class.
- Fixed: The DECORATE translation code was not changed for the new data structures.
- Expanded range of ACS and DECORATE translations to 65535. 
- Fixed: R_CopyTranslation was not altered for the new functionality.
  I removed the function and replaced the one use with a simple assignment.


SVN r644 (trunk)
This commit is contained in:
Christoph Oelckers 2007-12-26 16:06:03 +00:00
commit 0535d15df3
39 changed files with 862 additions and 779 deletions
Download patch file Download diff file Expand all files Collapse all files

46
src/g_level.cpp
View file

@ -73,6 +73,7 @@
#include "statnums.h"
#include "vectors.h"
#include "sbarinfo.h"
#include "r_translate.h"
#include "gi.h"
@ -2688,58 +2689,37 @@ void G_SerializeLevel (FArchive &arc, bool hubLoad)
// Does this level have custom translations?
FRemapTable *trans;
WORD w;
if (arc.IsStoring ())
{
for (unsigned int i = 0; i < translationtables[TRANSLATION_LevelScripted].Size(); ++i)
{
trans = translationtables[TRANSLATION_LevelScripted][i];
int j;
for (j = 0; j < 256; ++j)
if (trans != NULL && !trans->IsIdentity())
{
if (trans->Remap[j] != j)
{
break;
}
}
if (j < 256)
{
t = i;
arc << t;
arc.Write (trans->Remap, 256);
for (j = 0; j < 256; ++j)
{
arc << trans->Palette[j].r
<< trans->Palette[j].g
<< trans->Palette[j].b;
}
w = WORD(i);
arc << w;
trans->Serialize(arc);
}
}
t = 255;
arc << t;
w = 0xffff;
arc << w;
}
else
{
arc << t;
while (t != 255)
while (arc << w, w != 0xffff)
{
if (t >= MAX_ACS_TRANSLATIONS)
if (w >= MAX_ACS_TRANSLATIONS)
{ // hack hack to avoid crashing
t = 0;
w = 0;
}
trans = translationtables[TRANSLATION_LevelScripted].GetVal(t);
trans = translationtables[TRANSLATION_LevelScripted].GetVal(w);
if (trans == NULL)
{
trans = new FRemapTable;
translationtables[TRANSLATION_LevelScripted].SetVal(t, trans);
}
arc.Read (trans->Remap, 256);
for (int j = 0; j < 256; ++j)
{
arc << trans->Palette[j].r
<< trans->Palette[j].g
<< trans->Palette[j].b;
}
arc << t;
trans->Serialize(arc);
}
}