Commit c3e7ebdb authored by Stephen Kitt's avatar Stephen Kitt

Imported Upstream version 3.9

parent 60df533f
......@@ -9,7 +9,7 @@
SSSS ttt eeeee llll llll aaaaa
===========================================================================
Release 3.8.1 for Linux, MacOSX and Windows
Release 3.9 for Linux, MacOSX and Windows
===========================================================================
The Atari 2600 Video Computer System (VCS), introduced in 1977, was the
......@@ -21,28 +21,28 @@ all of your favourite Atari 2600 games again! Stella was originally
developed for Linux by Bradford W. Mott, however, it has been ported to a
number of other platforms and is currently maintained by Stephen Anthony.
This is the 3.8.1 release of Stella for Linux, Mac OSX and Windows. The
This is the 3.9 release of Stella for Linux, Mac OSX and Windows. The
distributions currently available are:
* Binaries for Windows XP/Vista/7 :
Stella-3.8.1-win32.exe (32-bit EXE installer)
Stella-3.8.1-x64.exe (64-bit EXE installer)
Stella-3.8.1-windows.zip (32/64 bit versions)
* Binaries for Windows XP/Vista/7/8 :
Stella-3.9-win32.exe (32-bit EXE installer)
Stella-3.9-x64.exe (64-bit EXE installer)
Stella-3.9-windows.zip (32/64 bit versions)
* Binary distribution for MacOS X 32-bit & 64-bit :
Stella-3.8.1-macosx.dmg (32-bit Universal Binary)
Stella-3.8.1_intel-macosx.dmg (32/64-bit Intel/OSX 10.6+)
Stella-3.9-macosx.dmg (32-bit Universal Binary)
Stella-3.9_intel-macosx.dmg (32/64-bit Intel/OSX 10.6+)
* Binary distribution in 32-bit & 64-bit Ubuntu DEB format :
stella_3.8.1-1_i386.deb
stella_3.8.1-1_amd64.deb
stella_3.9-1_i386.deb
stella_3.9-1_amd64.deb
* Binary distribution in 32-bit & 64-bit RPM format :
stella-3.8.1-2.i386.rpm
stella-3.8.1-2.x86_64.rpm
stella-3.9-2.i386.rpm
stella-3.9-2.x86_64.rpm
* Source code distribution for all platforms :
stella-3.8.1-src.tar.gz
stella-3.9-src.tar.gz
Distribution Site
......
......@@ -12,6 +12,91 @@
Release History
===========================================================================
3.8.1 to 3.9: (June 27, 2013)
* Greatly extended functionality of the debugger disassembly:
- There is now a new tab which lists information specific to the
cartridge bankswitching scheme in use. This includes the ability
to modify internal state even for esoteric ROMs which don't
follow the standard layout of 4K per bank.
- The debugger now generates DASM-compatible disassembled code,
which can be saved to an external file. This disassembly is
based on both a static and runtime analysis, and is extremely
accurate. It also automatically differentiates between
CODE/PGFX/GFX/DATA/ROW areas, whereas normal Distella
only differentiates between CODE/GFX/ROW. For now, only
single-bank (4K and smaller) ROMs are supported; support for
multi-bank ROMs will come in a future release.
- The disassembly now recognizes various TIA/RIOT read/write
mirrors, and marks them as such (for example, INPT4|$30 instead
of INPT4 for address $3C). Special thanks to Omegamatrix for
sample code and idea for this feature.
- ROMS less than 2K in size (so called 'Sub2K' ROMs) now show only
the actual data in the binary. This means, for example, that a
256 byte ROM will show only 256 bytes in the disassembly, instead
of padding duplicated data to 2K boundary.
- Fixed bug when entering patched bytes; the current number base
wasn't being used.
- Fixed labelling in ROW directives; it wasn't accurately setting
a label in the case where it occurred in the middle of the data.
- Added a new dialog for changing Distella settings, located by
right-clicking the disassembly code.
- The commandline option 'dis.resolvedata' has been renamed to
'dis.resolve', with new usage (see manual for further details).
* Fixed regression in handling ZIP files (as compared to version 3.7.5)
created with newer versions of the ZIP program. Related to this, added
better error messages for invalid/missing/unreadable ROM files.
* Added 'snapname' commandline argument and associated UI item, for
specifying whether snapshots should be saved using either the internal
ROM database name or the actual ROM filename. This feature was
present in older releases of Stella, and due to popular demand it's
now back again. Related to this, added a new dialog specifically for
the numerous snapshot-related items.
* Fixed bug in Linux/OSX versions when starting Stella for the first
time; it was previously creating mislabeled directories to store
settings, snapshots, etc.
* Fixed redundant "New console created" message when entering the same
ROM multiple times from the ROM launcher.
* Updated profile database for "BasketBall" ROMs; the joysticks are now
swapped by default, which allows one and two-player games to work
correctly.
* SuperCharger/AR ROMs now ignore the 'ramrandom' setting, and start with
RAM containing all zeroes. This seems to fix issues with Dragonstomper
always starting in exactly the same state.
* Fixed issue when debugging CompuMate ROMs; keystrokes entered while
debugging would be interpreted as typing on the CompuMate keyboard.
* Changed colour of the 'current PC indicator' in the debugger to
match the one used for line selection. This makes it easier to
see for those with problems seeing lighter colours.
* Improved functionality of the various pop-up dialogs and context
menus in the UI; they can now be navigated more fully by the keyboard
and mouse.
* Updated internal ROM properties database to ROM-Hunter version 9
(thanks go to RomHunter for his tireless research in this area).
Related to this, updated the snapshot collection.
* Updated included PNG and ZLIB libraries to latest stable version.
-Have fun!
3.8 to 3.8.1: (March 3, 2013)
* Added support for TIA RSYNC writes, thanks to Omegamatrix of AtariAge.
......@@ -27,8 +112,6 @@
* The OSX DMG archive now contains proper modification dates.
-Have fun!
3.7.5 to 3.8: (February 21, 2013)
......
......@@ -213,6 +213,8 @@ Optional Features:
--disable-joystick
--enable-cheats enable/disable cheatcode support [enabled]
--disable-cheats
--enable-thumb enable/disable Thumb ARM support [enabled]
--disable-thumb
--enable-shared build shared binary [enabled]
--enable-static build static binary (if possible) [disabled]
--disable-static
......
stella (3.9-1) stable; urgency=high
* Version 3.9 release
-- Stephen Anthony <stephena@users.sf.net> Thu, 27 Jun 2013 17:20:07 -0330
stella (3.8.1-1) stable; urgency=high
* Version 3.8.1 release
......
This diff is collapsed.
docs/graphics/debugger_iotab.png

8.27 KB | W: | H:

docs/graphics/debugger_iotab.png

8.35 KB | W: | H:

docs/graphics/debugger_iotab.png
docs/graphics/debugger_iotab.png
docs/graphics/debugger_iotab.png
docs/graphics/debugger_iotab.png
  • 2-up
  • Swipe
  • Onion skin
docs/graphics/debugger_main.png

32.5 KB | W: | H:

docs/graphics/debugger_main.png

31 KB | W: | H:

docs/graphics/debugger_main.png
docs/graphics/debugger_main.png
docs/graphics/debugger_main.png
docs/graphics/debugger_main.png
  • 2-up
  • Swipe
  • Onion skin
docs/graphics/debugger_ram.png

5.63 KB | W: | H:

docs/graphics/debugger_ram.png

5.91 KB | W: | H:

docs/graphics/debugger_ram.png
docs/graphics/debugger_ram.png
docs/graphics/debugger_ram.png
docs/graphics/debugger_ram.png
  • 2-up
  • Swipe
  • Onion skin
docs/graphics/debugger_ramsearch.png

5.07 KB | W: | H:

docs/graphics/debugger_ramsearch.png

5.56 KB | W: | H:

docs/graphics/debugger_ramsearch.png
docs/graphics/debugger_ramsearch.png
docs/graphics/debugger_ramsearch.png
docs/graphics/debugger_ramsearch.png
  • 2-up
  • Swipe
  • Onion skin
docs/graphics/debugger_rom.png

9.73 KB | W: | H:

docs/graphics/debugger_rom.png

9.16 KB | W: | H:

docs/graphics/debugger_rom.png
docs/graphics/debugger_rom.png
docs/graphics/debugger_rom.png
docs/graphics/debugger_rom.png
  • 2-up
  • Swipe
  • Onion skin
docs/graphics/debugger_romcmenu.png

6.71 KB | W: | H:

docs/graphics/debugger_romcmenu.png

9.94 KB | W: | H:

docs/graphics/debugger_romcmenu.png
docs/graphics/debugger_romcmenu.png
docs/graphics/debugger_romcmenu.png
docs/graphics/debugger_romcmenu.png
  • 2-up
  • Swipe
  • Onion skin
docs/graphics/debugger_tiainfo.png

1.6 KB | W: | H:

docs/graphics/debugger_tiainfo.png

1.7 KB | W: | H:

docs/graphics/debugger_tiainfo.png
docs/graphics/debugger_tiainfo.png
docs/graphics/debugger_tiainfo.png
docs/graphics/debugger_tiainfo.png
  • 2-up
  • Swipe
  • Onion skin
docs/graphics/debugger_tiatab.png

9.7 KB | W: | H:

docs/graphics/debugger_tiatab.png

9.19 KB | W: | H:

docs/graphics/debugger_tiatab.png
docs/graphics/debugger_tiatab.png
docs/graphics/debugger_tiatab.png
docs/graphics/debugger_tiatab.png
  • 2-up
  • Swipe
  • Onion skin
docs/graphics/logs.png

9.4 KB | W: | H:

docs/graphics/logs.png

9.1 KB | W: | H:

docs/graphics/logs.png
docs/graphics/logs.png
docs/graphics/logs.png
docs/graphics/logs.png
  • 2-up
  • Swipe
  • Onion skin
docs/graphics/options.png

3.57 KB | W: | H:

docs/graphics/options.png

4.17 KB | W: | H:

docs/graphics/options.png
docs/graphics/options.png
docs/graphics/options.png
docs/graphics/options.png
  • 2-up
  • Swipe
  • Onion skin
docs/graphics/options_audio.png

3.11 KB | W: | H:

docs/graphics/options_audio.png

3.1 KB | W: | H:

docs/graphics/options_audio.png
docs/graphics/options_audio.png
docs/graphics/options_audio.png
docs/graphics/options_audio.png
  • 2-up
  • Swipe
  • Onion skin
docs/graphics/options_video.png

9.04 KB | W: | H:

docs/graphics/options_video.png

8.3 KB | W: | H:

docs/graphics/options_video.png
docs/graphics/options_video.png
docs/graphics/options_video.png
docs/graphics/options_video.png
  • 2-up
  • Swipe
  • Onion skin
docs/graphics/options_video_tv.png

8.33 KB | W: | H:

docs/graphics/options_video_tv.png

7.83 KB | W: | H:

docs/graphics/options_video_tv.png
docs/graphics/options_video_tv.png
docs/graphics/options_video_tv.png
docs/graphics/options_video_tv.png
  • 2-up
  • Swipe
  • Onion skin
docs/graphics/rom_browser.png

3.56 KB | W: | H:

docs/graphics/rom_browser.png

4.84 KB | W: | H:

docs/graphics/rom_browser.png
docs/graphics/rom_browser.png
docs/graphics/rom_browser.png
docs/graphics/rom_browser.png
  • 2-up
  • Swipe
  • Onion skin
......@@ -10,7 +10,7 @@
<br><br>
<center><h2><b>A multi-platform Atari 2600 VCS emulator</b></h2></center>
<center><h4><b>Release 3.8.1</b></h4></center>
<center><h4><b>Release 3.9</b></h4></center>
<br><br>
<center><h2><b>User's Guide</b></h2></center>
......@@ -54,7 +54,7 @@
<br><br><br>
<center><b>February 1999 - March 2013</b></center>
<center><b>February 1999 - June 2013</b></center>
<center><b>The Stella Team</b></center>
<center><b><a href="http://stella.sourceforge.net">Stella Homepage</a></b></center>
......@@ -288,8 +288,9 @@
both TIA sprites and collisions for each object separately</li>
<li>Full system state save/load functionality</li>
<li>Cross-platform UI including a built-in ROM launcher frontend</li>
<li>Built-in extensive debugger, including static analysis with the Distella disassembler,
and dynamic analysis at runtime by tracking code/graphics/data sections</li>
<li>Built-in extensive debugger, including static analysis with the Distella disassembler
and dynamic analysis at runtime by tracking code/graphics/data sections, and
generation of DASM-compatible disassembly files</li>
<li>Emulation of CRT TV systems using <a href="http://slack.net/~ant/libs/ntsc.html">
Blargg filtering</a>, including presets for several common TV outputs
(composite, S-video, RGB, etc), and ability to fully customize
......@@ -556,6 +557,7 @@
<p>At this point, you may want to set the locations for snapshots and other
external paths. This is described in more detail in
<b>Advanced Configuration - <a href="#Snapshots">Snapshot Settings</a></b> and
<b>Advanced Configuration - <a href="#ConfigPaths">Config Paths</a></b>.
These settings are optional, and can be left at the defaults if you won't be using
snapshots in the ROM launcher.</p>
......@@ -1786,7 +1788,7 @@
<td><pre>-tv_filter &lt;1 - 6&gt;</pre></td>
<td>OpenGL mode only. Blargg TV effects, 0 is disabled, next numbers in
sequence represent presets for 'composite', 's-video', 'RGB', 'bad adjust',
and 'custom' modes'.</td>
and 'custom' modes.</td>
</tr>
<tr>
......@@ -1944,12 +1946,6 @@
<td>Set the volume (0 - 100).</td>
</tr>
<tr>
<td><pre>-clipvol &lt;1|0&gt;</pre></td>
<td>Enable volume clipping (eliminates popping). Do not change
unless you experience sound issues.</td>
</tr>
<tr>
<td><pre>-cheat &lt;code&gt;</pre></td>
<td>Use the specified cheatcode (see Cheat section for description).</td>
......@@ -2049,6 +2045,12 @@
<td>The directory to load snapshot files from.</td>
</tr>
<tr>
<td><pre>-snapname &lt;int|rom&gt;</pre></td>
<td>When saving snapshots, use either the internal database name or
the actual ROM filename.</td>
</tr>
<tr>
<td><pre>-sssingle &lt;1|0&gt;</pre></td>
<td>Generate single snapshot instead of many, overwriting
......@@ -2191,7 +2193,7 @@
</tr>
<tr>
<td><pre>-dis.resolvedata &lt;never|always|auto&gt;</pre></td>
<td><pre>-dis.resolve &lt;1|0&gt;</pre></td>
<td>Try to differentiate between code vs. data sections in the
disassembler. See the Debugger section for more information.</td>
</tr>
......@@ -2465,7 +2467,7 @@
<td valign="top">
<table border="1" cellpadding="4">
<tr><th>Item</th><th>Brief description</th><th>For more information,<br>see <a href="#CommandLine">CommandLine</a></th></tr>
<tr><td>Debugger Width/Height</td><td>self-explanatory (requires restart)</td><td>-debuggerres</td></tr>
<tr><td>Debugger Width/Height</td><td>self-explanatory (requires ROM reload)</td><td>-debuggerres</td></tr>
</table>
</td>
</tr>
......@@ -2486,6 +2488,26 @@
</tr>
</table>
<br>
<a name="Snapshots"></a>
<p><b>Snapshot Settings</b> dialog:</p>
<table border="5" cellpadding="2" frame="box" rules="none">
<tr>
<td><img src="graphics/launcher_options_snapshots.png"></td>
<td>&nbsp;&nbsp;&nbsp;&nbsp;</td>
<td valign="top">
<table border="1" cellpadding="4">
<tr><th>Item</th><th>Brief description</th><th>For more information,<br>see <a href="#CommandLine">CommandLine</a></th></tr>
<tr><td>Save path</td><td>specifies where to save snapshots</td><td>-snapsavedir</td></tr>
<tr><td>Load path</td><td>specifies where to load snapshots</td><td>-snaploaddir</td></tr>
<tr><td>Save snapshots according to</td><td>specifies how to name saved snapshots</td><td>-snapname</td></tr>
<tr><td>Continuous snapshot interval</td><td>interval (in seconds) between snapshot</td><td>-ssinterval</td></tr>
<tr><td>Overwrite existing files</td><td>whether to overwrite old snapshots</td><td>-sssingle</td></tr>
<tr><td>Disable image filtering (1x mode)</td><td>save snapshot in 1x mode, without filtering</td><td>-ss1x</td></tr>
</table>
</td>
</tr>
</table>
<br>
<a name="ConfigPaths"></a>
<p><b>Config Paths</b> dialog:</p>
<table border="5" cellpadding="2" frame="box" rules="none">
......@@ -2496,16 +2518,11 @@
<table border="1" cellpadding="4">
<tr><th>Item</th><th>Brief description</th><th>For more information,<br>see <a href="#CommandLine">CommandLine</a></th></tr>
<tr><td>Rom path</td><td>specifies location of ROM files</td><td>-romdir</td></tr>
<tr><td>Snapshot save path</td><td>specifies where to save snapshots</td><td>-snapsavedir</td></tr>
<tr><td>Snapshot load path</td><td>specifies where to load snapshots</td><td>-snaploaddir</td></tr>
<tr><td>Cheat file</td><td>specifies location of cheatfile database</td><td>-cheatfile</td></tr>
<tr><td>Palette file</td><td>specifies location of user palette</td><td>-palettefile</td></tr>
<tr><td>Properties file </td><td>specifies location of external stella.pro database</td><td>-propsfile</td></tr>
<tr><td>State path</td><td>specifies location of state files</td><td>-statedir</td></tr>
<tr><td>NVRAM path</td><td>specifies location of NVRAM (flash/EEPROM) files</td><td>-nvramdir</td></tr>
<tr><td>Overwrite snapshots</td><td>whether to overwrite old snapshots</td><td>-sssingle</td></tr>
<tr><td>Snapshot in 1x mode</td><td>save snapshot in 1x mode, without filtering</td><td>-ss1x</td></tr>
<tr><td>Continuous snapshot interval</td><td>interval (in seconds) between snapshot</td><td>-ssinterval</td></tr>
</table>
</td>
</tr>
......
......@@ -14,7 +14,7 @@
// See the file "License.txt" for information on usage and redistribution of
// this file, and for a DISCLAIMER OF ALL WARRANTIES.
//
// $Id: CheatCodeDialog.cxx 2579 2013-01-04 19:49:01Z stephena $
// $Id: CheatCodeDialog.cxx 2743 2013-05-29 16:27:12Z stephena $
//
// Based on code from ScummVM - Scumm Interpreter
// Copyright (C) 2002-2004 The ScummVM project
......@@ -59,7 +59,6 @@ CheatCodeDialog::CheatCodeDialog(OSystem* osystem, DialogContainer* parent,
myCheatList =
new CheckListWidget(this, font, xpos, ypos, _w - buttonWidth - 25,
_h - 2*buttonHeight - 10);
myCheatList->setStyle(kXFill);
myCheatList->setEditable(false);
wid.push_back(myCheatList);
......@@ -150,8 +149,8 @@ void CheatCodeDialog::saveConfig()
void CheatCodeDialog::addCheat()
{
myCheatInput->show(); // Center input dialog over entire screen
myCheatInput->setEditString("", 0);
myCheatInput->setEditString("", 1);
myCheatInput->setText("", 0);
myCheatInput->setText("", 1);
myCheatInput->setTitle("");
myCheatInput->setFocus(0);
myCheatInput->setEmitSignal(kCheatAdded);
......@@ -169,8 +168,8 @@ void CheatCodeDialog::editCheat()
const string& code = list[idx]->code();
myCheatInput->show(); // Center input dialog over entire screen
myCheatInput->setEditString(name, 0);
myCheatInput->setEditString(code, 1);
myCheatInput->setText(name, 0);
myCheatInput->setText(code, 1);
myCheatInput->setTitle("");
myCheatInput->setFocus(1);
myCheatInput->setEmitSignal(kCheatEdited);
......@@ -187,8 +186,8 @@ void CheatCodeDialog::removeCheat()
void CheatCodeDialog::addOneShotCheat()
{
myCheatInput->show(); // Center input dialog over entire screen
myCheatInput->setEditString("One-shot cheat", 0);
myCheatInput->setEditString("", 1);
myCheatInput->setText("One-shot cheat", 0);
myCheatInput->setText("", 1);
myCheatInput->setTitle("");
myCheatInput->setFocus(1);
myCheatInput->setEmitSignal(kOneShotCheatAdded);
......@@ -209,7 +208,7 @@ void CheatCodeDialog::handleCommand(CommandSender* sender, int cmd,
close();
break;
case kListItemDoubleClickedCmd:
case ListWidget::kDoubleClickedCmd:
editCheat();
break;
......
......@@ -14,7 +14,7 @@
// See the file "License.txt" for information on usage and redistribution of
// this file, and for a DISCLAIMER OF ALL WARRANTIES.
//
// $Id: CheatManager.cxx 2579 2013-01-04 19:49:01Z stephena $
// $Id: CheatManager.cxx 2726 2013-05-08 23:34:42Z stephena $
//============================================================================
#include <fstream>
......@@ -300,7 +300,7 @@ void CheatManager::loadCheats(const string& md5sum)
// (and remove the key from the settings, so they won't get set again)
const string& cheats = myOSystem->settings().getString("cheat");
if(cheats != "")
myOSystem->settings().setString("cheat", "");
myOSystem->settings().setValue("cheat", "");
CheatCodeMap::iterator iter = myCheatMap.find(md5sum);
if(iter == myCheatMap.end() && cheats == "")
......
......@@ -14,7 +14,7 @@
// See the file "License.txt" for information on usage and redistribution of
// this file, and for a DISCLAIMER OF ALL WARRANTIES.
//
// $Id: Array.hxx 2579 2013-01-04 19:49:01Z stephena $
// $Id: Array.hxx 2678 2013-03-31 00:10:05Z stephena $
//
// Based on code from ScummVM - Scumm Interpreter
// Copyright (C) 2002-2004 The ScummVM project
......@@ -33,8 +33,8 @@ template <class T>
class Array
{
protected:
int _capacity;
int _size;
uInt32 _capacity;
uInt32 _size;
T *_data;
public:
......@@ -48,7 +48,7 @@ class Array
_size = array._size;
_capacity = _size + 128;
_data = new T[_capacity];
for(int i = 0; i < _size; i++)
for(uInt32 i = 0; i < _size; i++)
_data[i] = array._data[i];
}
......@@ -58,7 +58,7 @@ class Array
delete [] _data;
}
void reserve(int capacity)
void reserve(uInt32 capacity)
{
if(capacity <= _capacity)
return;
......@@ -74,11 +74,11 @@ class Array
void push_back(const Array<T>& array)
{
ensureCapacity(_size + array._size);
for(int i = 0; i < array._size; i++)
for(uInt32 i = 0; i < array._size; i++)
_data[_size++] = array._data[i];
}
void insert_at(int idx, const T& element)
void insert_at(uInt32 idx, const T& element)
{
assert(idx >= 0 && idx <= _size);
ensureCapacity(_size + 1);
......@@ -87,30 +87,30 @@ class Array
// usually isn't correct (specifically, for any class which has a non-default
// copy behaviour. E.g. the String class uses a refCounter which has to be
// updated whenever a String is copied.
for(int i = _size; i > idx; i--)
for(uInt32 i = _size; i > idx; i--)
_data[i] = _data[i-1];
_data[idx] = element;
_size++;
}
T remove_at(int idx)
T remove_at(uInt32 idx)
{
assert(idx >= 0 && idx < _size);
T tmp = _data[idx];
for(int i = idx; i < _size - 1; i++)
for(uInt32 i = idx; i < _size - 1; i++)
_data[i] = _data[i+1];
_size--;
return tmp;
}
T& operator [](int idx)
T& operator [](uInt32 idx)
{
assert(idx >= 0 && idx < _size);
return _data[idx];
}
const T& operator [](int idx) const
const T& operator [](uInt32 idx) const
{
assert(idx >= 0 && idx < _size);
return _data[idx];
......@@ -123,24 +123,27 @@ class Array
_size = array._size;
_capacity = _size + 128;
_data = new T[_capacity];
for(int i = 0; i < _size; i++)
for(uInt32 i = 0; i < _size; i++)
_data[i] = array._data[i];
return *this;
}
unsigned int size() const { return _size; }
unsigned int capacity() const { return _capacity; }
uInt32 size() const { return _size; }
uInt32 capacity() const { return _capacity; }
void clear()
void clear(bool fullerase = true)
{
if(_data)
if(fullerase)
{
delete [] _data;
_data = 0;
if(_data)
{
delete [] _data;
_data = 0;
}
_capacity = 0;
}
_size = 0;
_capacity = 0;
}
bool isEmpty() const
......@@ -169,7 +172,7 @@ class Array
}
protected:
void ensureCapacity(int new_len)
void ensureCapacity(uInt32 new_len)
{
if (new_len <= _capacity)
return;
......@@ -181,7 +184,7 @@ class Array
if (old_data)
{
// Copy old data
for (int i = 0; i < _size; i++)
for (uInt32 i = 0; i < _size; i++)
_data[i] = old_data[i];
delete [] old_data;
}
......
......@@ -14,7 +14,7 @@
// See the file "License.txt" for information on usage and redistribution of
// this file, and for a DISCLAIMER OF ALL WARRANTIES.
//
// $Id: FSNodeZIP.cxx 2610 2013-02-15 19:04:52Z stephena $
// $Id: FSNodeZIP.cxx 2746 2013-06-10 14:19:56Z stephena $
//
// Based on code from ScummVM - Scumm Interpreter
// Copyright (C) 2002-2004 The ScummVM project
......@@ -30,7 +30,7 @@ FilesystemNodeZIP::FilesystemNodeZIP()
{
// We need a name, else the node is invalid
_path = _shortPath = _virtualFile = "";
_isValid = false;
_error = ZIPERR_NOT_A_FILE;
_numFiles = 0;