Fixed ASSDraw3 and building of auto4-perl with console disabled.

Originally committed to SVN as r1849.
This commit is contained in:
Rodrigo Braz Monteiro 2008-01-27 03:04:42 +00:00
parent 9a7012de0b
commit b2a854396c
6 changed files with 11 additions and 10 deletions

View File

@ -266,8 +266,8 @@ namespace Automation4 {
XS(perl_console_register) XS(perl_console_register)
{ {
wxTRACE_FUNC(Aegisub::PerlConsole::register_console); wxTRACE_FUNC(Aegisub::PerlConsole::register_console);
#ifdef WITH_PERLCONSOLE
dXSARGS; dXSARGS;
#ifdef WITH_PERLCONSOLE
PerlScript *script = PerlScript::GetScript(); PerlScript *script = PerlScript::GetScript();
if(script) { if(script) {

View File

@ -1,7 +1,7 @@
Aegisub changelog Aegisub changelog
Please visit http://aegisub.net to download latest version Please visit http://aegisub.net to download latest version
= 2.00 - 2008.xx.xx =========================== = 2.2.0 - 2008.xx.xx ===========================
- New Aegisub logo. (amz) - New Aegisub logo. (amz)
- The Automation 4 system has been introduced. This means lots of changes. (jfs) - The Automation 4 system has been introduced. This means lots of changes. (jfs)

View File

@ -63,7 +63,7 @@
/> />
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
OutputFile="$(OutDir)\assdraw3_d.exe" OutputFile="../bin/assdraw3_d.exe"
LinkIncremental="2" LinkIncremental="2"
GenerateDebugInformation="true" GenerateDebugInformation="true"
SubSystem="2" SubSystem="2"
@ -214,7 +214,7 @@
/> />
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
OutputFile="$(OutDir)\assdraw3.exe" OutputFile="../bin/assdraw3.exe"
LinkIncremental="1" LinkIncremental="1"
GenerateDebugInformation="true" GenerateDebugInformation="true"
SubSystem="2" SubSystem="2"

View File

@ -125,11 +125,12 @@ void DrawCmd_B::Init ( unsigned n )
// to ASS drawing command // to ASS drawing command
wxString DrawCmd_B::ToString() wxString DrawCmd_B::ToString()
{ {
PointList::iterator iterate = controlpoints.begin(); if (initialized) {
Point* c1 = (*iterate++); PointList::iterator iterate = controlpoints.begin();
Point* c2 = (*iterate); Point* c1 = (*iterate++);
if (initialized) Point* c2 = (*iterate);
return wxString::Format(_T("b %d %d %d %d %d %d"), c1->x(), c1->y(), c2->x(), c2->y(), m_point->x(), m_point->y()); return wxString::Format(_T("b %d %d %d %d %d %d"), c1->x(), c1->y(), c2->x(), c2->y(), m_point->x(), m_point->y());
}
else else
return wxString::Format(_T("b ? ? ? ? %d %d"), m_point->x(), m_point->y()); return wxString::Format(_T("b ? ? ? ? %d %d"), m_point->x(), m_point->y());
} }

View File

@ -33,7 +33,7 @@
; ;
#define MyAppName "Aegisub" #define MyAppName "Aegisub"
#define MyAppRevision "r1840" #define MyAppRevision "r1847"
#define MyAppVer "2.1.0 Release Preview" #define MyAppVer "2.1.0 Release Preview"
#define MyAppPublisher "Aegisub Team" #define MyAppPublisher "Aegisub Team"
#define MyAppURL "http://aegisub.net/" #define MyAppURL "http://aegisub.net/"

View File

@ -1,3 +1,3 @@
release;1.10-524;http://www.aegisub.net/;Aegisub 1.10 release;1.10-524;http://www.aegisub.net/;Aegisub 1.10
svn;1813;http://www.malakith.net/amz/aegisub/;Aegisub Pre-Release 2.00 r1813 build - Guess what? Bug fixes! svn;1847;http://www.malakith.net/amz/aegisub/;Aegisub 2.1.0 Release Preview r1847 build - Core executable considered stable unless someone finds any issues. Marked "Release Preview" due to incomplete documentation, scripts, and translations.