[Scummvm-git-logs] scummvm master -> b5b2766d352abb2117099c6962f4e4fece544da2
mduggan
mgithub at guarana.org
Sat Sep 5 07:37:43 UTC 2020
This automated email contains information about 5 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
98915bab70 DEVTOOLS: Add usage message to create_translations
13302fc9fd ULTIMA8: Add a few comments about what classes do
26f8cb7d9c ULTIMA8: JANITORIAL: Better whitespace
3555503bfd ULTIMA8: Remove redundant clearing of strings
b5b2766d35 ULTIMA8: Update Crusader detection entries
Commit: 98915bab701bbffbb68d322b14e8b47637f75a4d
https://github.com/scummvm/scummvm/commit/98915bab701bbffbb68d322b14e8b47637f75a4d
Author: Matthew Duggan (mgithub at guarana.org)
Date: 2020-09-05T16:37:27+09:00
Commit Message:
DEVTOOLS: Add usage message to create_translations
Changed paths:
devtools/create_translations/create_translations.cpp
diff --git a/devtools/create_translations/create_translations.cpp b/devtools/create_translations/create_translations.cpp
index 685eb21c2b..db6af5b3ac 100644
--- a/devtools/create_translations/create_translations.cpp
+++ b/devtools/create_translations/create_translations.cpp
@@ -122,6 +122,12 @@ int main(int argc, char *argv[]) {
}
}
+ if (!numLangs) {
+ fprintf(stderr, "ERROR: No valid translation files\n");
+ fprintf(stderr, "usage: create_translations lang1.po [lang2.po ...]\n");
+ return -1;
+ }
+
for (int i = 0; i < numLangs; i++) {
if (!translations[i]->useUTF8()) {
fprintf(stderr, "ERROR: Po Language file for: \"%s\", named as \"%s\" is not encoded in UTF-8\n", translations[i]->languageName(), translations[i]->language());
Commit: 13302fc9fd46226ceda470732698a9ac8ac5459c
https://github.com/scummvm/scummvm/commit/13302fc9fd46226ceda470732698a9ac8ac5459c
Author: Matthew Duggan (mgithub at guarana.org)
Date: 2020-09-05T16:37:27+09:00
Commit Message:
ULTIMA8: Add a few comments about what classes do
Changed paths:
engines/ultima/ultima8/graphics/cycle_process.h
engines/ultima/ultima8/graphics/fade_to_modal_process.h
engines/ultima/ultima8/graphics/inverter_process.h
engines/ultima/ultima8/graphics/palette_fader_process.h
engines/ultima/ultima8/world/camera_process.h
diff --git a/engines/ultima/ultima8/graphics/cycle_process.h b/engines/ultima/ultima8/graphics/cycle_process.h
index 7f847a5804..94e743f98c 100644
--- a/engines/ultima/ultima8/graphics/cycle_process.h
+++ b/engines/ultima/ultima8/graphics/cycle_process.h
@@ -31,6 +31,7 @@
namespace Ultima {
namespace Ultima8 {
+/** The process to cycle some palette colors in Crusader */
class CycleProcess : public Process {
uint8 _running;
uint8 _cycleColData[7][3];
diff --git a/engines/ultima/ultima8/graphics/fade_to_modal_process.h b/engines/ultima/ultima8/graphics/fade_to_modal_process.h
index d78dfc76d2..486b93bd6d 100644
--- a/engines/ultima/ultima8/graphics/fade_to_modal_process.h
+++ b/engines/ultima/ultima8/graphics/fade_to_modal_process.h
@@ -32,6 +32,7 @@ namespace Ultima8 {
class PaletteFaderProcess;
+/** A process to fade out the screen and open a modal */
class FadeToModalProcess : public Process {
enum FadeToModalState {
diff --git a/engines/ultima/ultima8/graphics/inverter_process.h b/engines/ultima/ultima8/graphics/inverter_process.h
index 4ca226fe66..c9535eab18 100644
--- a/engines/ultima/ultima8/graphics/inverter_process.h
+++ b/engines/ultima/ultima8/graphics/inverter_process.h
@@ -30,6 +30,7 @@
namespace Ultima {
namespace Ultima8 {
+/** The process to tear and flip the screen, triggered by some game events in U8 */
class InverterProcess : public Process {
public:
InverterProcess();
diff --git a/engines/ultima/ultima8/graphics/palette_fader_process.h b/engines/ultima/ultima8/graphics/palette_fader_process.h
index 5056183106..c098733005 100644
--- a/engines/ultima/ultima8/graphics/palette_fader_process.h
+++ b/engines/ultima/ultima8/graphics/palette_fader_process.h
@@ -31,6 +31,7 @@
namespace Ultima {
namespace Ultima8 {
+/** A process to fade the palette from one transform matrix to another */
class PaletteFaderProcess : public Process {
int _priority;
int32 _counter;
diff --git a/engines/ultima/ultima8/world/camera_process.h b/engines/ultima/ultima8/world/camera_process.h
index 9beade0caa..a1aeab1af5 100644
--- a/engines/ultima/ultima8/world/camera_process.h
+++ b/engines/ultima/ultima8/world/camera_process.h
@@ -30,15 +30,14 @@
namespace Ultima {
namespace Ultima8 {
-//
-// The camera process. This works in 3 ways
-//
-// It can be set to stay where it currently is
-// It can be set to follow an item.
-// It can be set to scroll to an item
-// It can be set to stay at a location
-//
-
+/**
+* The camera process. This works in 4 ways:
+*
+* It can be set to stay where it currently is
+* It can be set to follow an item.
+* It can be set to scroll to an item
+* It can be set to stay at a location
+*/
class CameraProcess : public Process {
public:
CameraProcess();
Commit: 26f8cb7d9cc98efb2f7513482d520d1a874ca923
https://github.com/scummvm/scummvm/commit/26f8cb7d9cc98efb2f7513482d520d1a874ca923
Author: Matthew Duggan (mgithub at guarana.org)
Date: 2020-09-05T16:37:27+09:00
Commit Message:
ULTIMA8: JANITORIAL: Better whitespace
Changed paths:
engines/ultima/ultima8/convert/convert_shape.cpp
diff --git a/engines/ultima/ultima8/convert/convert_shape.cpp b/engines/ultima/ultima8/convert/convert_shape.cpp
index 2332ad8f02..8dd8528b9e 100644
--- a/engines/ultima/ultima8/convert/convert_shape.cpp
+++ b/engines/ultima/ultima8/convert/convert_shape.cpp
@@ -110,21 +110,21 @@ void ConvertShape::Read(IDataSource *source, const ConvertShapeFormat *csf, uint
#ifdef COMP_SHAPENUM
if (shapenum == COMP_SHAPENUM) pout << "Frame " << f << Std::endl;
#endif
- ConvertShapeFrame *frame = _frames+f;
+ ConvertShapeFrame *frame = _frames + f;
#ifdef COMP_SHAPENUM
- if (shapenum == COMP_SHAPENUM) pout << "Seeking to " << (csf->_len_header + (csf->_len_frameheader*f)) << Std::endl;
- if (shapenum == COMP_SHAPENUM) pout << "Real " << (start_pos + csf->_len_header + (csf->_len_frameheader*f)) << Std::endl;
+ if (shapenum == COMP_SHAPENUM) pout << "Seeking to " << (csf->_len_header + (csf->_len_frameheader * f)) << Std::endl;
+ if (shapenum == COMP_SHAPENUM) pout << "Real " << (start_pos + csf->_len_header + (csf->_len_frameheader * f)) << Std::endl;
#endif
// Seek to initial pos
- source->seek(start_pos + csf->_len_header + (csf->_len_frameheader*f));
+ source->seek(start_pos + csf->_len_header + (csf->_len_frameheader * f));
#ifdef COMP_SHAPENUM
if (shapenum == COMP_SHAPENUM) pout << "seeked to " << source->pos() << Std::endl;
#endif
// Read the offset
- uint32 frame_offset = csf->_len_header + (csf->_len_frameheader*f);
+ uint32 frame_offset = csf->_len_header + (csf->_len_frameheader * f);
if (csf->_bytes_frame_offset) frame_offset = source->readX(csf->_bytes_frame_offset);
#ifdef COMP_SHAPENUM
if (shapenum == COMP_SHAPENUM) pout << "frame_offset " << frame_offset << Std::endl;
@@ -144,7 +144,7 @@ void ConvertShape::Read(IDataSource *source, const ConvertShapeFormat *csf, uint
source->seek(start_pos + frame_offset + csf->_bytes_special);
if (csf->_bytes_special)
- frame->ReadCmpFrame(source, csf, special, f>0?_frames+f-1:0);
+ frame->ReadCmpFrame(source, csf, special, f > 0 ? _frames + f - 1 : 0);
else
frame->Read(source, csf, frame_length);
}
@@ -196,11 +196,11 @@ void ConvertShapeFrame::Read(IDataSource *source, const ConvertShapeFormat *csf,
// Now fudge with the value and turn it into an offset into the rle data
// If required
if (!csf->_line_offset_absolute)
- _line_offsets[i] -= (_height-i)*csf->_bytes_line_offset;
+ _line_offsets[i] -= (_height - i) * csf->_bytes_line_offset;
}
// Calculate the number of bytes of RLE data
- _bytes_rle = frame_length - (csf->_len_frameheader2+(_height*csf->_bytes_line_offset));
+ _bytes_rle = frame_length - (csf->_len_frameheader2 + (_height * csf->_bytes_line_offset));
#ifdef COMP_SHAPENUM
if (_bytes_rle < 0) {
@@ -264,7 +264,7 @@ void ConvertShapeFrame::ReadCmpFrame(IDataSource *source, const ConvertShapeForm
if (dlen == 0 || dlen == 1) {
source->seek(-1, SEEK_CUR);
rlebuf->seek(-1, SEEK_CUR);
- rlebuf->writeByte(skip+(_width-xpos));
+ rlebuf->writeByte(skip + (_width - xpos));
break;
}
@@ -285,15 +285,15 @@ void ConvertShapeFrame::ReadCmpFrame(IDataSource *source, const ConvertShapeForm
if (special[c] && prev) {
int32 count = special[c];
- prev->GetPixels(o,count,xpos-_xoff,y-_yoff);
+ prev->GetPixels(o, count, xpos - _xoff, y - _yoff);
o+=count;
- extra += count-1;
+ extra += count - 1;
xpos += count;
} else if (c == 0xFF && prev) {
int32 count = source->readByte();
- prev->GetPixels(o,count,xpos-_xoff,y-_yoff);
+ prev->GetPixels(o, count, xpos - _xoff, y - _yoff);
o+=count;
- extra += count-2;
+ extra += count - 2;
xpos += count;
j++;
} else {
@@ -309,7 +309,7 @@ void ConvertShapeFrame::ReadCmpFrame(IDataSource *source, const ConvertShapeForm
rlebuf->writeByte((dlen+extra) << _compression);
rlebuf->write(outbuf,dlen+extra);
} else {
- rlebuf->writeByte((dlen<<1)|1);
+ rlebuf->writeByte((dlen << 1) | 1);
rlebuf->writeByte(source->readByte());
xpos+=dlen;
}
@@ -353,7 +353,7 @@ void ConvertShapeFrame::GetPixels(uint8 *buf, int32 count, int32 x, int32 y) {
if (dlen < count) num = dlen;
if (!type) {
- const uint8 *l = (linedata+=diff);
+ const uint8 *l = (linedata += diff);
while (num--) {
*buf++ = *l++;
@@ -382,20 +382,20 @@ void ConvertShapeFrame::GetPixels(uint8 *buf, int32 count, int32 x, int32 y) {
}
int ConvertShape::CalcNumFrames(IDataSource *source, const ConvertShapeFormat *csf, uint32 real_len, uint32 start_pos) {
- int f=0;
+ int f = 0;
uint32 first_offset = 0xFFFFFFFF;
uint32 save_pos = source->pos();
- for (f=0;;f++) {
+ for (f = 0;; f++) {
// Seek to initial pos
- source->seek(start_pos + csf->_len_header + (csf->_len_frameheader*f));
+ source->seek(start_pos + csf->_len_header + (csf->_len_frameheader * f));
if ((source->pos()-start_pos) >= first_offset) break;
// Read the offset
- uint32 frame_offset = csf->_len_header + (csf->_len_frameheader*f);
+ uint32 frame_offset = csf->_len_header + (csf->_len_frameheader * f);
if (csf->_bytes_frame_offset) frame_offset = source->readX(csf->_bytes_frame_offset) + csf->_bytes_special;
if (frame_offset < first_offset) first_offset = frame_offset;
@@ -457,10 +457,10 @@ bool ConvertShape::Check(IDataSource *source, const ConvertShapeFormat *csf, uin
ConvertShapeFrame *frame = &oneframe;
// Seek to initial pos
- source->seek(start_pos + csf->_len_header + (csf->_len_frameheader*f));
+ source->seek(start_pos + csf->_len_header + (csf->_len_frameheader * f));
// Read the offset
- uint32 frame_offset = csf->_len_header + (csf->_len_frameheader*f);
+ uint32 frame_offset = csf->_len_header + (csf->_len_frameheader * f);
if (csf->_bytes_frame_offset) frame_offset = source->readX(csf->_bytes_frame_offset) + csf->_bytes_special;
// Read the unknown
@@ -504,7 +504,7 @@ bool ConvertShape::Check(IDataSource *source, const ConvertShapeFormat *csf, uin
int32 highest_offset_byte = 0;
// Calculate the number of bytes of RLE data
- frame->_bytes_rle = frame_length - (csf->_len_frameheader2+(frame->_height*csf->_bytes_line_offset));
+ frame->_bytes_rle = frame_length - (csf->_len_frameheader2 + (frame->_height * csf->_bytes_line_offset));
// Totally invalid shape
if (frame->_bytes_rle < 0) {
@@ -525,7 +525,7 @@ bool ConvertShape::Check(IDataSource *source, const ConvertShapeFormat *csf, uin
// Now fudge with the value and turn it into an offset into the rle data
// if required
if (!csf->_line_offset_absolute)
- line_offset -= (frame->_height-i)*csf->_bytes_line_offset;
+ line_offset -= (frame->_height - i) * csf->_bytes_line_offset;
if (line_offset > frame->_bytes_rle) {
result = false;
@@ -539,7 +539,7 @@ bool ConvertShape::Check(IDataSource *source, const ConvertShapeFormat *csf, uin
if (result == false) break;
// Jump to the line offset and calculate the length of the run
- source->seek(highest_offset_byte + start_pos + frame_offset + csf->_len_frameheader2 + frame->_height*csf->_bytes_line_offset);
+ source->seek(highest_offset_byte + start_pos + frame_offset + csf->_len_frameheader2 + frame->_height * csf->_bytes_line_offset);
int xpos = 0;
uint32 dlen = 0;
@@ -574,7 +574,7 @@ bool ConvertShape::Check(IDataSource *source, const ConvertShapeFormat *csf, uin
// Calc 'real' bytes rle
int32 highest_rle_byte = source->pos();
- highest_rle_byte -= start_pos + frame_offset + csf->_len_frameheader2 + frame->_height*csf->_bytes_line_offset;
+ highest_rle_byte -= start_pos + frame_offset + csf->_len_frameheader2 + frame->_height * csf->_bytes_line_offset;
// Too many bytes
if (highest_rle_byte > frame->_bytes_rle) {
@@ -636,10 +636,10 @@ bool ConvertShape::CheckUnsafe(IDataSource *source, const ConvertShapeFormat *cs
ConvertShapeFrame *frame = &oneframe;
// Seek to initial pos
- source->seek(start_pos + csf->_len_header + (csf->_len_frameheader*f));
+ source->seek(start_pos + csf->_len_header + (csf->_len_frameheader * f));
// Read the offset
- uint32 frame_offset = csf->_len_header + (csf->_len_frameheader*f);
+ uint32 frame_offset = csf->_len_header + (csf->_len_frameheader * f);
if (csf->_bytes_frame_offset) frame_offset = source->readX(csf->_bytes_frame_offset) + csf->_bytes_special;
// Read the unknown
@@ -680,7 +680,7 @@ bool ConvertShape::CheckUnsafe(IDataSource *source, const ConvertShapeFormat *cs
if (frame->_height) {
// Calculate the number of bytes of RLE data (may not be accurate but we don't care)
- frame->_bytes_rle = frame_length - (csf->_len_frameheader2+(frame->_height*csf->_bytes_line_offset));
+ frame->_bytes_rle = frame_length - (csf->_len_frameheader2 + (frame->_height * csf->_bytes_line_offset));
// Totally invalid shape
if (frame->_bytes_rle < 0) {
@@ -721,13 +721,13 @@ void ConvertShape::Write(ODataSource *dest, const ConvertShapeFormat *csf, uint3
// Now write the _frames
for(uint32 f = 0; f < _num_frames; f++) {
- ConvertShapeFrame *frame = _frames+f;
+ ConvertShapeFrame *frame = _frames + f;
// Get the frame offset
uint32 frame_offset = dest->pos() - start_pos;
// Seek to the frame header pos
- dest->seek(start_pos + csf->_len_header + (csf->_len_frameheader*f));
+ dest->seek(start_pos + csf->_len_header + (csf->_len_frameheader * f));
// Write the offset
if (csf->_bytes_frame_offset) dest->writeX(frame_offset, csf->_bytes_frame_offset);
@@ -737,7 +737,7 @@ void ConvertShape::Write(ODataSource *dest, const ConvertShapeFormat *csf, uint3
// Calc and write frame_length
if (csf->_bytes_frame_length) {
- uint32 frame_length = csf->_len_frameheader2 + (frame->_height*csf->_bytes_line_offset) + frame->_bytes_rle;
+ uint32 frame_length = csf->_len_frameheader2 + (frame->_height * csf->_bytes_line_offset) + frame->_bytes_rle;
dest->writeX(frame_length - csf->_bytes_frame_length_kludge, csf->_bytes_frame_length);
}
@@ -760,7 +760,7 @@ void ConvertShape::Write(ODataSource *dest, const ConvertShapeFormat *csf, uint3
// Unfudge the value and write it, if requiretd
if (!csf->_line_offset_absolute)
- actual_offset += (frame->_height-i)*csf->_bytes_line_offset;
+ actual_offset += (frame->_height - i) * csf->_bytes_line_offset;
dest->writeX(actual_offset, csf->_bytes_line_offset);
}
Commit: 3555503bfd9cb9b1c50a1cf6da2f6ab3291d08d8
https://github.com/scummvm/scummvm/commit/3555503bfd9cb9b1c50a1cf6da2f6ab3291d08d8
Author: Matthew Duggan (mgithub at guarana.org)
Date: 2020-09-05T16:37:27+09:00
Commit Message:
ULTIMA8: Remove redundant clearing of strings
Changed paths:
engines/ultima/ultima8/conf/ini_file.cpp
diff --git a/engines/ultima/ultima8/conf/ini_file.cpp b/engines/ultima/ultima8/conf/ini_file.cpp
index 20829f8f4b..911a4aa947 100644
--- a/engines/ultima/ultima8/conf/ini_file.cpp
+++ b/engines/ultima/ultima8/conf/ini_file.cpp
@@ -202,10 +202,8 @@ bool INIFile::readConfigString(string config) {
// save previous section
_sections.push_back(section);
}
- section._name.clear();
- section._comment.clear();
- section._keys.clear();
+ section._keys.clear();
section._name = line.substr(1, p - 1);
section._comment = comment;
comment.clear();
Commit: b5b2766d352abb2117099c6962f4e4fece544da2
https://github.com/scummvm/scummvm/commit/b5b2766d352abb2117099c6962f4e4fece544da2
Author: Matthew Duggan (mgithub at guarana.org)
Date: 2020-09-05T16:37:27+09:00
Commit Message:
ULTIMA8: Update Crusader detection entries
Changed paths:
engines/ultima/detection_tables.h
diff --git a/engines/ultima/detection_tables.h b/engines/ultima/detection_tables.h
index 6f7f5c590f..2f7b50ab64 100644
--- a/engines/ultima/detection_tables.h
+++ b/engines/ultima/detection_tables.h
@@ -278,16 +278,15 @@ static const UltimaGameDescription GAME_DESCRIPTIONS[] = {
AD_ENTRY1s("jusecode.flx", "1793bb252b805bf8d59300690987c605", 1208003),
Common::JA_JPN,
Common::kPlatformDOS,
- ADGF_UNSTABLE,
+ ADGF_TESTING,
GUIO1(GUIO_NOMIDI)
},
GAME_ULTIMA8,
0
},
-#ifndef RELEASE_BUILD
// Crusader games use basically the same engine as ultima8, but still
- // need a lot of work.
+ // need a lot of work. All are unstable, some simply crash on startup.
// GOG Crusader - No Remorse (V1.21)
{
@@ -334,6 +333,21 @@ static const UltimaGameDescription GAME_DESCRIPTIONS[] = {
0
},
+ // Crusader - No Remorse (Japanese) provided by Dominus
+ {
+ {
+ "remorse",
+ "",
+ AD_ENTRY1s("jusecode.flx", "088105959be4f2de1cb9e796e71c5f2d", 554522),
+ Common::JA_JPN,
+ Common::kPlatformWindows,
+ ADGF_UNSTABLE,
+ GUIO1(GUIO_NOMIDI)
+ },
+ GAME_CRUSADER_REM,
+ 0
+ },
+
// Crusader - No Remorse - Demo V1.12D
{
{
@@ -364,7 +378,7 @@ static const UltimaGameDescription GAME_DESCRIPTIONS[] = {
0
},
- // Crusader - No Regret - Demo - V1.08
+ // Crusader - No Regret - Demo V1.08
{
{
"regret",
@@ -393,7 +407,6 @@ static const UltimaGameDescription GAME_DESCRIPTIONS[] = {
GAME_CRUSADER_REG,
0
},
-#endif
// GOG Martian Dreams
{
More information about the Scummvm-git-logs
mailing list